diff options
| author | Jeremy Allison <jra@samba.org> | 2000-04-18 20:41:04 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-04-18 20:41:04 +0000 |
| commit | 4217c939ec6bdb80a3fe953e5b60f6f7b7a43635 (patch) | |
| tree | 3b24c24f7221c0c84b5482c5fd90292002e881ba /source3/printing/printing.c | |
| parent | 7b1c5392f789ff933e8ab61c9b65b400b7c33ffe (diff) | |
| download | samba-4217c939ec6bdb80a3fe953e5b60f6f7b7a43635.tar.gz samba-4217c939ec6bdb80a3fe953e5b60f6f7b7a43635.tar.bz2 samba-4217c939ec6bdb80a3fe953e5b60f6f7b7a43635.zip | |
locking/locking.c: Fixed placeholder code for POSIX locking.
printing/printing.c: Cast tdb_delete to (tdb_traverse_func) to stop warning.
tmpfile gives mirror warning.
smbd/groupname.c: Remember to file_lines_free() on exit.
tdb/tdb.h: Add tdb_traverse_func typedef.
Jeremy
(This used to be commit 204ca1195c86499bd9beb273ce573db7a56ccead)
Diffstat (limited to 'source3/printing/printing.c')
| -rw-r--r-- | source3/printing/printing.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 27219657ea..8fa9d7db25 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -77,7 +77,7 @@ BOOL print_backend_init(void) /* handle a Samba upgrade */ tdb_writelock(tdb); if (tdb_get_int(tdb, "INFO/version") != PRINT_DATABASE_VERSION) { - tdb_traverse(tdb, tdb_delete, NULL); + tdb_traverse(tdb, (tdb_traverse_func)tdb_delete, NULL); tdb_store_int(tdb, "INFO/version", PRINT_DATABASE_VERSION); } tdb_writeunlock(tdb); @@ -276,7 +276,7 @@ static void print_queue_update(int snum) char *path = lp_pathname(snum); char *cmd = lp_lpqcommand(snum); char **qlines; - pstring tmpfile; + pstring tmp_file; int numlines, i, qcount; print_queue_struct *queue = NULL; print_status_struct status; @@ -285,15 +285,15 @@ static void print_queue_update(int snum) fstring keystr; TDB_DATA data, key; - slprintf(tmpfile, sizeof(tmpfile), "%s/smblpq.%d", path, local_pid); + slprintf(tmp_file, sizeof(tmp_file), "%s/smblpq.%d", path, local_pid); - unlink(tmpfile); - print_run_command(snum, cmd, tmpfile, + unlink(tmp_file); + print_run_command(snum, cmd, tmp_file, NULL, NULL, NULL, NULL); numlines = 0; - qlines = file_lines_load(tmpfile, &numlines); - unlink(tmpfile); + qlines = file_lines_load(tmp_file, &numlines); + unlink(tmp_file); /* turn the lpq output into a series of job structures */ qcount = 0; |