r8431: Ensure to use dev_private and not private after Jeremy's CPP reserved
authorLars Müller <lmuelle@samba.org>
Wed, 13 Jul 2005 16:47:42 +0000 (16:47 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:00:05 +0000 (11:00 -0500)
names rename.

Jerry: I'm not sure if we have to use the string 'dev_private' instead
of 'private' as second arg to PyDict_SetItemString().

source/python/py_spoolss_printers_conv.c

index e31babb0012a0d5d68259c50dbe3b1f0debf203b..4ab030d961962117742d3d9701314d60118bf13b 100644 (file)
@@ -154,7 +154,7 @@ BOOL py_from_DEVICEMODE(PyObject **dict, DEVICEMODE *devmode)
 
        PyDict_SetItemString(*dict, "private",
                             PyString_FromStringAndSize(
-                                    devmode->private, devmode->driverextra));
+                                    devmode->dev_private, devmode->driverextra));
 
        return True;
 }
@@ -170,7 +170,7 @@ BOOL py_to_DEVICEMODE(DEVICEMODE *devmode, PyObject *dict)
        if (!PyString_Check(obj))
                goto done;
 
-       devmode->private = PyString_AsString(obj);
+       devmode->dev_private = PyString_AsString(obj);
        devmode->driverextra = PyString_Size(obj);
 
        PyDict_DelItemString(dict_copy, "private");