diff options
| author | Gerald Carter <jerry@samba.org> | 2001-11-22 06:23:49 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-11-22 06:23:49 +0000 |
| commit | 37a84c7bba9b6379dd54f41f0c9495ecb66307bf (patch) | |
| tree | 093ff69b4abe6d4f1188022877a514f485a0948f /source3/printing | |
| parent | fae4bc494dbed6518e42e6cc971fcf8743a82f9a (diff) | |
| download | samba-37a84c7bba9b6379dd54f41f0c9495ecb66307bf.tar.gz samba-37a84c7bba9b6379dd54f41f0c9495ecb66307bf.tar.bz2 samba-37a84c7bba9b6379dd54f41f0c9495ecb66307bf.zip | |
merge oops fix from 2.2
(This used to be commit 48f2da440f973047faa7ecf031be66bc30d4a985)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 028f449479..8e022ac1f6 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -181,7 +181,7 @@ static BOOL upgrade_to_version_2(void) DEBUG(0,("upgrade_to_version_2: upgrading print tdb's to version 2\n")); for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr; - newkey = tdb_nextkey(tdb_drivers, kbuf), SAFE_FREE(kbuf.dptr), kbuf=newkey) { + newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) { dbuf = tdb_fetch(tdb_drivers, kbuf); @@ -323,7 +323,7 @@ int get_ntforms(nt_forms_struct **list) for (kbuf = tdb_firstkey(tdb_forms); kbuf.dptr; - newkey = tdb_nextkey(tdb_forms, kbuf), SAFE_FREE(kbuf.dptr), kbuf=newkey) { + newkey = tdb_nextkey(tdb_forms, kbuf), safe_free(kbuf.dptr), kbuf=newkey) { if (strncmp(kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) != 0) continue; dbuf = tdb_fetch(tdb_forms, kbuf); @@ -510,7 +510,7 @@ int get_ntdrivers(fstring **list, char *architecture, uint32 version) for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr; - newkey = tdb_nextkey(tdb_drivers, kbuf), SAFE_FREE(kbuf.dptr), kbuf=newkey) { + newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) { if (strncmp(kbuf.dptr, key, strlen(key)) != 0) continue; if((fl = Realloc(*list, sizeof(fstring)*(total+1))) == NULL) { @@ -3203,7 +3203,7 @@ BOOL printer_driver_in_use (char *arch, char *driver) /* loop through the printers.tdb and check for the drivername */ for (kbuf = tdb_firstkey(tdb_printers); kbuf.dptr; - newkey = tdb_nextkey(tdb_printers, kbuf), SAFE_FREE(kbuf.dptr), kbuf=newkey) + newkey = tdb_nextkey(tdb_printers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) { dbuf = tdb_fetch(tdb_printers, kbuf); |