]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
printing: Simplify calling print commands
authorVolker Lendecke <vl@samba.org>
Fri, 30 Apr 2021 10:12:40 +0000 (12:12 +0200)
committerJeremy Allison <jra@samba.org>
Tue, 11 May 2021 22:56:37 +0000 (22:56 +0000)
We have fstr_sprintf for this

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/printing/print_generic.c

index 075382780d48245551b988c0c5347a33307b0bc2..743c311bbd5fa5a5fe2f0b9e7639bd3404b5c20f 100644 (file)
@@ -108,7 +108,7 @@ static int generic_job_delete( const char *sharename, const char *lprm_command,
        fstring jobstr;
 
        /* need to delete the spooled entry */
-       slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
+       fstr_sprintf(jobstr, "%d", pjob->sysjob);
        return print_run_command( -1, sharename, False, lprm_command, NULL,
                   "%j", jobstr,
                   "%T", http_timestring(talloc_tos(), pjob->starttime),
@@ -125,7 +125,7 @@ static int generic_job_pause(int snum, struct printjob *pjob)
        fstring jobstr;
        
        /* need to pause the spooled entry */
-       slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
+       fstr_sprintf(jobstr, "%d", pjob->sysjob);
        return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
                                 lp_lppause_command(snum), NULL,
                                 "%j", jobstr,
@@ -142,7 +142,7 @@ static int generic_job_resume(int snum, struct printjob *pjob)
        fstring jobstr;
 
        /* need to pause the spooled entry */
-       slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
+       fstr_sprintf(jobstr, "%d", pjob->sysjob);
        return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
                                 lp_lpresume_command(snum), NULL,
                                 "%j", jobstr,
@@ -263,8 +263,8 @@ static int generic_job_submit(int snum, struct printjob *pjob,
                ret = -1;
                goto out;
        }
-       slprintf(job_page_count, sizeof(job_page_count)-1, "%d", pjob->page_count);
-       slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size);
+       fstr_sprintf(job_page_count, "%d", pjob->page_count);
+       fstr_sprintf(job_size, "%zu", pjob->size);
 
        /* send it to the system spooler */
        ret = print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,