Moved form related functions as methods in the policy handle object.

1 files changed, 17 insertions, 37 deletions

diff --git a/source/python/py_spoolss_forms.c b/source/python/py_spoolss_forms.c
index fc7db6ac934..24724dba252 100644
--- a/source/python/py_spoolss_forms.c
+++ b/source/python/py_spoolss_forms.c
@@ -49,23 +49,19 @@ struct pyconv py_FORM_1[] = {
 
 PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw)
 {
-	PyObject *po;
-	spoolss_policy_hnd_object *hnd;
+	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
 	PyObject *py_form;
 	FORM form;
 	int level = 1;
-	static char *kwlist[] = {"hnd", "form", "level", NULL};
+	static char *kwlist[] = {"form", "level", NULL};
 
 	/* Parse parameters */
 
 	if (!PyArg_ParseTupleAndKeywords(
-		    args, kw, "O!O!|i", kwlist, &spoolss_policy_hnd_type, &po, 
-		    &PyDict_Type, &py_form, &level))
+		    args, kw, "O!|i", kwlist, &PyDict_Type, &py_form, &level))
 		return NULL;
 	
-	hnd = (spoolss_policy_hnd_object *)po;
-	
 	/* Call rpc function */
 
 	switch (level) {
@@ -105,25 +101,20 @@ PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw)
 
 PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw)
 {
-	PyObject *po;
-	spoolss_policy_hnd_object *hnd;
+	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
 	PyObject *result;
 	char *form_name;
 	int level = 1;
-	static char *kwlist[] = {"hnd", "form_name", "level", NULL};
+	static char *kwlist[] = {"form_name", "level", NULL};
 	uint32 needed;
 	FORM_1 form;
 
 	/* Parse parameters */
 
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "O!s|i", kwlist, 
-					 &spoolss_policy_hnd_type, &po, &form_name,
-					 &level))
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|i", kwlist, &form_name, &level))
 		return NULL;
 	
-	hnd = (spoolss_policy_hnd_object *)po;
-	
 	/* Call rpc function */
 
 	werror = cli_spoolss_getform(hnd->cli, hnd->mem_ctx, 0, &needed,
@@ -156,24 +147,20 @@ PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw)
 
 PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw)
 {
-	PyObject *po;
-	spoolss_policy_hnd_object *hnd;
+	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
 	PyObject *py_form;
 	int level = 1;
-	static char *kwlist[] = {"hnd", "form_name", "form", "level", NULL};
+	static char *kwlist[] = {"form_name", "form", "level", NULL};
 	char *form_name;
 	FORM form;
 
 	/* Parse parameters */
 
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "O!sO!|i", kwlist, 
-					 &spoolss_policy_hnd_type, &po, &form_name,
-					 &PyDict_Type, &py_form, &level))
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "sO!|i", kwlist, 
+					 &form_name, &PyDict_Type, &py_form, &level))
 		return NULL;
 	
-	hnd = (spoolss_policy_hnd_object *)po;
-	
 	/* Call rpc function */
 
 	to_struct(&form, py_form, py_FORM);
@@ -197,22 +184,18 @@ PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw)
 
 PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw)
 {
-	PyObject *po;
-	spoolss_policy_hnd_object *hnd;
+	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
 	int level = 1;
-	static char *kwlist[] = {"hnd", "form_name", "level", NULL};
+	static char *kwlist[] = {"form_name", "level", NULL};
 	char *form_name;
 
 	/* Parse parameters */
 	
 	if (!PyArg_ParseTupleAndKeywords(
-		    args, kw, "O!s|i", kwlist, &spoolss_policy_hnd_type, &po, 
-		    &form_name, &level))
+		    args, kw, "s|i", kwlist, &form_name, &level))
 		return NULL;
 	
-	hnd = (spoolss_policy_hnd_object *)po;
-	
 	/* Call rpc function */
 
 	werror = cli_spoolss_deleteform(
@@ -232,22 +215,19 @@ PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw)
 
 PyObject *spoolss_enumforms(PyObject *self, PyObject *args, PyObject *kw)
 {
-	PyObject *po, *result;
-	spoolss_policy_hnd_object *hnd;
+	PyObject *result;
+	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
 	uint32 level = 1, num_forms, needed, i;
-	static char *kwlist[] = {"hnd", "level", NULL};
+	static char *kwlist[] = {"level", NULL};
 	FORM_1 *forms;
 
 	/* Parse parameters */
 	
 	if (!PyArg_ParseTupleAndKeywords(
-		    args, kw, "O!|i", kwlist, &spoolss_policy_hnd_type,
-		    &po, &level))
+		    args, kw, "|i", kwlist, &level))
 		return NULL;
 	
-	hnd = (spoolss_policy_hnd_object *)po;
-	
 	/* Call rpc function */
 
 	werror = cli_spoolss_enumforms(