From: Volker Lendecke <vl@samba.org>
Date: Mon, 9 Nov 2020 18:48:21 +0000 (+0100)
Subject: pylibsmb: Merge unlink_file() into its only caller
X-Git-Tag: samba-4.14.0rc1~617
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee42dd0e9c4405b5c8bf58fd16ef0878763a330;p=thirdparty%2Fsamba.git

pylibsmb: Merge unlink_file() into its only caller

Now that delete_tree is in python code, align py_smb_unlink() with the
other functions.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 471f21d0a69..28a21b535d5 100644
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -1238,36 +1238,23 @@ static PyObject *py_cli_list(struct py_cli_state *self,
 	return result;
 }
 
-/*
- * Deletes a file
- */
-static NTSTATUS unlink_file(struct py_cli_state *self, const char *filename)
-{
-	NTSTATUS status;
-	uint32_t attrs = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-	struct tevent_req *req = NULL;
-
-	req = cli_unlink_send(
-		NULL, self->ev, self->cli, filename, attrs);
-	if (!py_tevent_req_wait_exc(self, req)) {
-		return NT_STATUS_INTERNAL_ERROR;
-	}
-	status = cli_unlink_recv(req);
-	TALLOC_FREE(req);
-
-	return status;
-}
-
 static PyObject *py_smb_unlink(struct py_cli_state *self, PyObject *args)
 {
 	NTSTATUS status;
 	const char *filename = NULL;
+	struct tevent_req *req = NULL;
+	const uint32_t attrs = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
 	if (!PyArg_ParseTuple(args, "s:unlink", &filename)) {
 		return NULL;
 	}
 
-	status = unlink_file(self, filename);
+	req = cli_unlink_send(NULL, self->ev, self->cli, filename, attrs);
+	if (!py_tevent_req_wait_exc(self, req)) {
+		return NULL;
+	}
+	status = cli_unlink_recv(req);
+	TALLOC_FREE(req);
 	PyErr_NTSTATUS_NOT_OK_RAISE(status);
 
 	Py_RETURN_NONE;