svn commit: samba r8431 - branches/SAMBA_3_0/source/python trunk/source/python

[lmuelle at samba.org]

Author: lmuelle
Date: 2005-07-13 16:47:42 +0000 (Wed, 13 Jul 2005)
New Revision: 8431

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8431

Log:
Ensure to use dev_private and not private after Jeremy's CPP reserved
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().

Modified:
   branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c
   trunk/source/python/py_spoolss_printers_conv.c


Changeset:
Modified: branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c	2005-07-13 15:19:28 UTC (rev 8430)
+++ branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c	2005-07-13 16:47:42 UTC (rev 8431)
@@ -154,7 +154,7 @@
 
 	PyDict_SetItemString(*dict, "private",
 			     PyString_FromStringAndSize(
-				     devmode->private, devmode->driverextra));
+				     devmode->dev_private, devmode->driverextra));
 
 	return True;
 }
@@ -170,7 +170,7 @@
 	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");

Modified: trunk/source/python/py_spoolss_printers_conv.c
===================================================================
--- trunk/source/python/py_spoolss_printers_conv.c	2005-07-13 15:19:28 UTC (rev 8430)
+++ trunk/source/python/py_spoolss_printers_conv.c	2005-07-13 16:47:42 UTC (rev 8431)
@@ -154,7 +154,7 @@
 
 	PyDict_SetItemString(*dict, "private",
 			     PyString_FromStringAndSize(
-				     devmode->private, devmode->driverextra));
+				     devmode->dev_private, devmode->driverextra));
 
 	return True;
 }
@@ -170,7 +170,7 @@
 	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");