diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source3/printing/print_generic.c | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source3/printing/print_generic.c')
-rw-r--r-- | source3/printing/print_generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 2a324fdd5c..5806b29206 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -104,7 +104,7 @@ static int generic_job_delete( const char *sharename, const char *lprm_command, slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob); return print_run_command( -1, sharename, False, lprm_command, NULL, "%j", jobstr, - "%T", http_timestring(pjob->starttime), + "%T", http_timestring(talloc_tos(), pjob->starttime), NULL); } @@ -238,7 +238,7 @@ static int generic_queue_get(const char *printer_name, } numlines = 0; - qlines = fd_lines_load(fd, &numlines,0); + qlines = fd_lines_load(fd, &numlines,0,NULL); close(fd); /* turn the lpq output into a series of job structures */ @@ -247,7 +247,7 @@ static int generic_queue_get(const char *printer_name, if (numlines && qlines) { queue = SMB_MALLOC_ARRAY(print_queue_struct, numlines+1); if (!queue) { - file_lines_free(qlines); + TALLOC_FREE(qlines); *q = NULL; return 0; } @@ -262,7 +262,7 @@ static int generic_queue_get(const char *printer_name, } } - file_lines_free(qlines); + TALLOC_FREE(qlines); *q = queue; return qcount; } |