Use get_level_value() utility fn.

Cleaned up some local variable naming.
(This used to be commit d4c7a85c2b5c45f1cc3273230d80a1d5923cd848)

2 files changed, 18 insertions, 46 deletions

diff --git a/source3/python/py_spoolss_jobs.c b/source3/python/py_spoolss_jobs.c
index 856e6252ea..cc5d42e0ee 100644
--- a/source3/python/py_spoolss_jobs.c
+++ b/source3/python/py_spoolss_jobs.c
@@ -224,42 +224,29 @@ PyObject *spoolss_hnd_startdocprinter(PyObject *self, PyObject *args, PyObject *
 	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
 	static char *kwlist[] = { "document_info", NULL };
-	PyObject *doc_info, *obj;
+	PyObject *info, *obj;
 	uint32 level, jobid;
 	char *document_name = NULL, *output_file = NULL, *data_type = NULL;
 
 	/* Parse parameters */
 
 	if (!PyArg_ParseTupleAndKeywords(
-		    args, kw, "O!", kwlist, &PyDict_Type, &doc_info))
+		    args, kw, "O!", kwlist, &PyDict_Type, &info))
 		return NULL;
 	
 	/* Check document_info parameter */
 
-	if ((obj = PyDict_GetItemString(doc_info, "level"))) {
-
-		if (!PyInt_Check(obj)) {
-			PyErr_SetString(spoolss_error,
-					"level not an integer");
-			return NULL;
-		}
-
-		level = PyInt_AsLong(obj);
-
-		/* Only level 1 supported by Samba! */
-
-		if (level != 1) {
-			PyErr_SetString(spoolss_error,
-					"unsupported info level");
-			return NULL;
-		}
+	if (!get_level_value(info, &level)) {
+		PyErr_SetString(spoolss_error, "invalid info level");
+		return NULL;
+	}
 
-	} else {
-		PyErr_SetString(spoolss_error, "no info level present");
+	if (level != 1) {
+		PyErr_SetString(spoolss_error, "unsupported info level");
 		return NULL;
 	}
 
-	if ((obj = PyDict_GetItemString(doc_info, "document_name"))) {
+	if ((obj = PyDict_GetItemString(info, "document_name"))) {
 
 		if (!PyString_Check(obj) && obj != Py_None) {
 			PyErr_SetString(spoolss_error,
@@ -275,7 +262,7 @@ PyObject *spoolss_hnd_startdocprinter(PyObject *self, PyObject *args, PyObject *
 		return NULL;
 	}
 
-	if ((obj = PyDict_GetItemString(doc_info, "output_file"))) {
+	if ((obj = PyDict_GetItemString(info, "output_file"))) {
 
 		if (!PyString_Check(obj) && obj != Py_None) {
 			PyErr_SetString(spoolss_error,
@@ -291,7 +278,7 @@ PyObject *spoolss_hnd_startdocprinter(PyObject *self, PyObject *args, PyObject *
 		return NULL;
 	}
 
-	if ((obj = PyDict_GetItemString(doc_info, "data_type"))) {
+	if ((obj = PyDict_GetItemString(info, "data_type"))) {
 		
 		if (!PyString_Check(obj) && obj != Py_None) {
 			PyErr_SetString(spoolss_error,
diff --git a/source3/python/py_spoolss_printers.c b/source3/python/py_spoolss_printers.c
index 2edad20fda..54ea54682d 100644
--- a/source3/python/py_spoolss_printers.c
+++ b/source3/python/py_spoolss_printers.c
@@ -177,7 +177,7 @@ PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw)
 {
 	spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
 	WERROR werror;
-	PyObject *info, *level_obj;
+	PyObject *info;
 	PRINTER_INFO_CTR ctr;
 	uint32 level;
 	static char *kwlist[] = {"dict", NULL};
@@ -192,28 +192,13 @@ PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw)
 		    args, kw, "O!", kwlist, &PyDict_Type, &info))
 		return NULL;
 	
-	/* Check dictionary contains a level */
-
-	if ((level_obj = PyDict_GetItemString(info, "level"))) {
-
-		if (!PyInt_Check(level_obj)) {
-			PyErr_SetString(spoolss_error, 
-					"level not an integer");
-			return NULL;
-		}
-
-		level = PyInt_AsLong(level_obj);
-
-		/* Only level 2, 3 supported by NT */
-
-		if (level != 2 && level != 3) {
-			PyErr_SetString(spoolss_error,
-					"unsupported info level");
-			return NULL;
-		}
+	if (!get_level_value(info, &level)) {
+		PyErr_SetString(spoolss_error, "invalid info level");
+		return NULL;
+	}
 
-	} else {
-		PyErr_SetString(spoolss_error, "no info level present");
+	if (level != 2 && level != 3) {
+		PyErr_SetString(spoolss_error, "unsupported info level");
 		return NULL;
 	}