diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/rpc_parse/parse_spoolss.c | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/rpc_parse/parse_spoolss.c')
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 6c2d6b4978..34e3f8fe35 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -774,15 +774,15 @@ BOOL spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE if (devmode->driverextra!=0) { if (UNMARSHALLING(ps)) { - devmode->private=PRS_ALLOC_MEM(ps, uint8, devmode->driverextra); - if(devmode->private == NULL) + devmode->dev_private=PRS_ALLOC_MEM(ps, uint8, devmode->driverextra); + if(devmode->dev_private == NULL) return False; - DEBUG(7,("spoolss_io_devmode: allocated memory [%d] for private\n",devmode->driverextra)); + DEBUG(7,("spoolss_io_devmode: allocated memory [%d] for dev_private\n",devmode->driverextra)); } - DEBUG(7,("spoolss_io_devmode: parsing [%d] bytes of private\n",devmode->driverextra)); - if (!prs_uint8s(False, "private", ps, depth, - devmode->private, devmode->driverextra)) + DEBUG(7,("spoolss_io_devmode: parsing [%d] bytes of dev_private\n",devmode->driverextra)); + if (!prs_uint8s(False, "dev_private", ps, depth, + devmode->dev_private, devmode->driverextra)) return False; } @@ -6188,7 +6188,7 @@ BOOL spoolss_io_q_getjob(const char *desc, SPOOL_Q_GETJOB *q_u, prs_struct *ps, void free_devmode(DEVICEMODE *devmode) { if (devmode!=NULL) { - SAFE_FREE(devmode->private); + SAFE_FREE(devmode->dev_private); SAFE_FREE(devmode); } } @@ -6350,7 +6350,7 @@ BOOL spoolss_io_q_routerreplyprinter (const char *desc, SPOOL_Q_ROUTERREPLYPRINT if (!prs_uint32("change_id", ps, depth, &q_u->change_id)) return False; - if (!prs_uint8s(False, "private", ps, depth, q_u->unknown2, 5)) + if (!prs_uint8s(False, "dev_private", ps, depth, q_u->unknown2, 5)) return False; return True; |