From 5951e762d564de31938cf9d18dd3a8abff2b5983 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 15 May 2002 06:22:53 +0000 Subject: Renamed functions that are methods of a printer handle object from spoolss_* to spoolss_hnd_* to make things a bit clearer. (This used to be commit 986d868837350e9b107c147e649f139fd7d881f0) --- source3/python/py_spoolss.c | 44 ++++++++++++++++----------------- source3/python/py_spoolss_drivers.c | 2 +- source3/python/py_spoolss_forms.c | 10 ++++---- source3/python/py_spoolss_jobs.c | 16 ++++++------ source3/python/py_spoolss_printerdata.c | 10 ++++---- source3/python/py_spoolss_printers.c | 4 +-- source3/python/py_spoolss_proto.h | 42 +++++++++++++++---------------- 7 files changed, 64 insertions(+), 64 deletions(-) (limited to 'source3/python') diff --git a/source3/python/py_spoolss.c b/source3/python/py_spoolss.c index b88c6cdeef..72f3329c08 100644 --- a/source3/python/py_spoolss.c +++ b/source3/python/py_spoolss.c @@ -73,7 +73,7 @@ Example: >>> spoolss.closeprinter(hnd) "}, - { "addprinterex", spoolss_addprinterex, METH_VARARGS, + { "addprinterex", (PyCFunction)spoolss_addprinterex, METH_VARARGS, "addprinterex()"}, /* Server enumeratation functions */ @@ -154,7 +154,7 @@ static PyMethodDef spoolss_hnd_methods[] = { /* Printer info */ - { "getprinter", (PyCFunction)spoolss_getprinter, + { "getprinter", (PyCFunction)spoolss_hnd_getprinter, METH_VARARGS | METH_KEYWORDS, "getprinter([level]) -> dict @@ -168,7 +168,7 @@ Example: 'flags': 8388608} "}, - { "setprinter", (PyCFunction)spoolss_setprinter, + { "setprinter", (PyCFunction)spoolss_hnd_setprinter, METH_VARARGS | METH_KEYWORDS, "setprinter(dict) -> None @@ -177,7 +177,7 @@ Set printer information. /* Printer drivers */ - { "getprinterdriver", (PyCFunction)spoolss_getprinterdriver, + { "getprinterdriver", (PyCFunction)spoolss_hnd_getprinterdriver, METH_VARARGS | METH_KEYWORDS, "getprinterdriver([level = 1, arch = \"Windows NT x86\"] -> dict @@ -186,85 +186,85 @@ Return a dictionary of printer driver information. /* Forms */ - { "enumforms", (PyCFunction)spoolss_enumforms, + { "enumforms", (PyCFunction)spoolss_hnd_enumforms, METH_VARARGS | METH_KEYWORDS, "enumforms([level = 1]) -> list Return a list of forms supported by a printer. "}, - { "setform", (PyCFunction)spoolss_setform, + { "setform", (PyCFunction)spoolss_hnd_setform, METH_VARARGS | METH_KEYWORDS, "setform(dict) -> None Set the form given by the dictionary argument. "}, - { "addform", (PyCFunction)spoolss_addform, + { "addform", (PyCFunction)spoolss_hnd_addform, METH_VARARGS | METH_KEYWORDS, "Insert a form" }, - { "getform", (PyCFunction)spoolss_getform, + { "getform", (PyCFunction)spoolss_hnd_getform, METH_VARARGS | METH_KEYWORDS, "Fetch form properties" }, - { "deleteform", (PyCFunction)spoolss_deleteform, + { "deleteform", (PyCFunction)spoolss_hnd_deleteform, METH_VARARGS | METH_KEYWORDS, "Delete a form" }, /* Job related methods */ - { "enumjobs", (PyCFunction)spoolss_enumjobs, + { "enumjobs", (PyCFunction)spoolss_hnd_enumjobs, METH_VARARGS | METH_KEYWORDS, "Enumerate jobs" }, - { "setjob", (PyCFunction)spoolss_setjob, + { "setjob", (PyCFunction)spoolss_hnd_setjob, METH_VARARGS | METH_KEYWORDS, "Set job information" }, - { "getjob", (PyCFunction)spoolss_getjob, + { "getjob", (PyCFunction)spoolss_hnd_getjob, METH_VARARGS | METH_KEYWORDS, "Get job information" }, - { "startpageprinter", (PyCFunction)spoolss_startpageprinter, + { "startpageprinter", (PyCFunction)spoolss_hnd_startpageprinter, METH_VARARGS | METH_KEYWORDS, "Notify spooler that a page is about to be printed." }, - { "endpageprinter", (PyCFunction)spoolss_endpageprinter, + { "endpageprinter", (PyCFunction)spoolss_hnd_endpageprinter, METH_VARARGS | METH_KEYWORDS, "Notify spooler that a page is about to be printed." }, - { "startdocprinter", (PyCFunction)spoolss_startdocprinter, + { "startdocprinter", (PyCFunction)spoolss_hnd_startdocprinter, METH_VARARGS | METH_KEYWORDS, "Notify spooler that a document is about to be printed." }, - { "enddocprinter", (PyCFunction)spoolss_enddocprinter, + { "enddocprinter", (PyCFunction)spoolss_hnd_enddocprinter, METH_VARARGS | METH_KEYWORDS, "Notify spooler that a document is about to be printed." }, - { "writeprinter", (PyCFunction)spoolss_writeprinter, + { "writeprinter", (PyCFunction)spoolss_hnd_writeprinter, METH_VARARGS | METH_KEYWORDS, "Write job data to a printer." }, /* Printer data */ - { "getprinterdata", (PyCFunction)spoolss_getprinterdata, + { "getprinterdata", (PyCFunction)spoolss_hnd_getprinterdata, METH_VARARGS | METH_KEYWORDS, "Get printer data." }, - { "setprinterdata", (PyCFunction)spoolss_setprinterdata, + { "setprinterdata", (PyCFunction)spoolss_hnd_setprinterdata, METH_VARARGS | METH_KEYWORDS, "Set printer data." }, - { "enumprinterdata", (PyCFunction)spoolss_enumprinterdata, + { "enumprinterdata", (PyCFunction)spoolss_hnd_enumprinterdata, METH_VARARGS | METH_KEYWORDS, "Enumerate printer data." }, - { "deleteprinterdata", (PyCFunction)spoolss_deleteprinterdata, + { "deleteprinterdata", (PyCFunction)spoolss_hnd_deleteprinterdata, METH_VARARGS | METH_KEYWORDS, "Delete printer data." }, - { "deleteprinterdataex", (PyCFunction)spoolss_deleteprinterdataex, + { "deleteprinterdataex", (PyCFunction)spoolss_hnd_deleteprinterdataex, METH_VARARGS | METH_KEYWORDS, "Delete printer data." }, diff --git a/source3/python/py_spoolss_drivers.c b/source3/python/py_spoolss_drivers.c index d4855c58a8..088dc54576 100644 --- a/source3/python/py_spoolss_drivers.c +++ b/source3/python/py_spoolss_drivers.c @@ -167,7 +167,7 @@ PyObject *spoolss_enumprinterdrivers(PyObject *self, PyObject *args, /* Fetch printer driver */ -PyObject *spoolss_getprinterdriver(PyObject *self, PyObject *args, +PyObject *spoolss_hnd_getprinterdriver(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; diff --git a/source3/python/py_spoolss_forms.c b/source3/python/py_spoolss_forms.c index fbe3240c15..83cdf9badd 100644 --- a/source3/python/py_spoolss_forms.c +++ b/source3/python/py_spoolss_forms.c @@ -22,7 +22,7 @@ /* Add a form */ -PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_addform(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -71,7 +71,7 @@ PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw) /* Get form properties */ -PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_getform(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -117,7 +117,7 @@ PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw) /* Set form properties */ -PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_setform(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -158,7 +158,7 @@ PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw) /* Delete a form */ -PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_deleteform(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -187,7 +187,7 @@ PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw) /* Enumerate forms */ -PyObject *spoolss_enumforms(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_enumforms(PyObject *self, PyObject *args, PyObject *kw) { PyObject *result; spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; diff --git a/source3/python/py_spoolss_jobs.c b/source3/python/py_spoolss_jobs.c index 6951ebab9a..3a02cdac68 100644 --- a/source3/python/py_spoolss_jobs.c +++ b/source3/python/py_spoolss_jobs.c @@ -22,7 +22,7 @@ /* Enumerate jobs */ -PyObject *spoolss_enumjobs(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_enumjobs(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -87,7 +87,7 @@ PyObject *spoolss_enumjobs(PyObject *self, PyObject *args, PyObject *kw) /* Set job command */ -PyObject *spoolss_setjob(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_setjob(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -116,7 +116,7 @@ PyObject *spoolss_setjob(PyObject *self, PyObject *args, PyObject *kw) /* Get job */ -PyObject *spoolss_getjob(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_getjob(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -161,7 +161,7 @@ PyObject *spoolss_getjob(PyObject *self, PyObject *args, PyObject *kw) /* Start page printer. This notifies the spooler that a page is about to be printed on the specified printer. */ -PyObject *spoolss_startpageprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_startpageprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -189,7 +189,7 @@ PyObject *spoolss_startpageprinter(PyObject *self, PyObject *args, PyObject *kw) /* End page printer. This notifies the spooler that a page has finished being printed on the specified printer. */ -PyObject *spoolss_endpageprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_endpageprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -217,7 +217,7 @@ PyObject *spoolss_endpageprinter(PyObject *self, PyObject *args, PyObject *kw) /* Start doc printer. This notifies the spooler that a document is about to be printed on the specified printer. */ -PyObject *spoolss_startdocprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_startdocprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -326,7 +326,7 @@ PyObject *spoolss_startdocprinter(PyObject *self, PyObject *args, PyObject *kw) /* End doc printer. This notifies the spooler that a document has finished being printed on the specified printer. */ -PyObject *spoolss_enddocprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_enddocprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -352,7 +352,7 @@ PyObject *spoolss_enddocprinter(PyObject *self, PyObject *args, PyObject *kw) /* Write data to a printer */ -PyObject *spoolss_writeprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_writeprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; diff --git a/source3/python/py_spoolss_printerdata.c b/source3/python/py_spoolss_printerdata.c index 0252b0e3ab..24e2340059 100644 --- a/source3/python/py_spoolss_printerdata.c +++ b/source3/python/py_spoolss_printerdata.c @@ -87,7 +87,7 @@ static BOOL py_to_printerdata(char **value, uint32 *data_type, return True; } -PyObject *spoolss_getprinterdata(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_getprinterdata(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; static char *kwlist[] = { "value", NULL }; @@ -123,7 +123,7 @@ PyObject *spoolss_getprinterdata(PyObject *self, PyObject *args, PyObject *kw) return result; } -PyObject *spoolss_setprinterdata(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_setprinterdata(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; static char *kwlist[] = { "data", NULL }; @@ -154,7 +154,7 @@ PyObject *spoolss_setprinterdata(PyObject *self, PyObject *args, PyObject *kw) return Py_None; } -PyObject *spoolss_enumprinterdata(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_enumprinterdata(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; static char *kwlist[] = { NULL }; @@ -199,7 +199,7 @@ PyObject *spoolss_enumprinterdata(PyObject *self, PyObject *args, PyObject *kw) return result; } -PyObject *spoolss_deleteprinterdata(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_deleteprinterdata(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; static char *kwlist[] = { "value", NULL }; @@ -225,7 +225,7 @@ PyObject *spoolss_deleteprinterdata(PyObject *self, PyObject *args, PyObject *kw return Py_None; } -PyObject *spoolss_deleteprinterdataex(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_deleteprinterdataex(PyObject *self, PyObject *args, PyObject *kw) { /* Not supported by Samba server */ diff --git a/source3/python/py_spoolss_printers.c b/source3/python/py_spoolss_printers.c index 79e4d95fb8..164ba974b9 100644 --- a/source3/python/py_spoolss_printers.c +++ b/source3/python/py_spoolss_printers.c @@ -110,7 +110,7 @@ PyObject *spoolss_closeprinter(PyObject *self, PyObject *args) /* Fetch printer information */ -PyObject *spoolss_getprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; @@ -176,7 +176,7 @@ PyObject *spoolss_getprinter(PyObject *self, PyObject *args, PyObject *kw) /* Set printer information */ -PyObject *spoolss_setprinter(PyObject *self, PyObject *args, PyObject *kw) +PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw) { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; diff --git a/source3/python/py_spoolss_proto.h b/source3/python/py_spoolss_proto.h index bef9fe350e..ae990433d6 100644 --- a/source3/python/py_spoolss_proto.h +++ b/source3/python/py_spoolss_proto.h @@ -14,7 +14,7 @@ void initspoolss(void); PyObject *spoolss_enumprinterdrivers(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_getprinterdriver(PyObject *self, PyObject *args, +PyObject *spoolss_hnd_getprinterdriver(PyObject *self, PyObject *args, PyObject *kw); PyObject *spoolss_getprinterdriverdir(PyObject *self, PyObject *args, PyObject *kw); @@ -42,11 +42,11 @@ BOOL py_to_DRIVER_DIRECTORY_1(DRIVER_DIRECTORY_1 *info, PyObject *dict); /* The following definitions come from python/py_spoolss_forms.c */ -PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_enumforms(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_addform(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_getform(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_setform(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_deleteform(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_enumforms(PyObject *self, PyObject *args, PyObject *kw); /* The following definitions come from python/py_spoolss_forms_conv.c */ @@ -55,14 +55,14 @@ BOOL py_to_FORM(FORM *form, PyObject *dict); /* The following definitions come from python/py_spoolss_jobs.c */ -PyObject *spoolss_enumjobs(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_setjob(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_getjob(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_startpageprinter(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_endpageprinter(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_startdocprinter(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_enddocprinter(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_writeprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_enumjobs(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_setjob(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_getjob(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_startpageprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_endpageprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_startdocprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_enddocprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_writeprinter(PyObject *self, PyObject *args, PyObject *kw); /* The following definitions come from python/py_spoolss_jobs_conv.c */ @@ -86,18 +86,18 @@ BOOL py_to_PORT_INFO_2(PORT_INFO_2 *info, PyObject *dict); /* The following definitions come from python/py_spoolss_printerdata.c */ -PyObject *spoolss_getprinterdata(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_setprinterdata(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_enumprinterdata(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_deleteprinterdata(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_deleteprinterdataex(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_getprinterdata(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_setprinterdata(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_enumprinterdata(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_deleteprinterdata(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_deleteprinterdataex(PyObject *self, PyObject *args, PyObject *kw); /* The following definitions come from python/py_spoolss_printers.c */ PyObject *spoolss_openprinter(PyObject *self, PyObject *args, PyObject *kw); PyObject *spoolss_closeprinter(PyObject *self, PyObject *args); -PyObject *spoolss_getprinter(PyObject *self, PyObject *args, PyObject *kw); -PyObject *spoolss_setprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw); +PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw); PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw); PyObject *spoolss_addprinterex(PyObject *self, PyObject *args, PyObject *kw); -- cgit