diff options
| author | Tim Potter <tpot@samba.org> | 2003-11-05 18:28:29 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-11-05 18:28:29 +0000 |
| commit | f59bd268945960ddd90fccf7cf7b077e1bdf41f2 (patch) | |
| tree | cb87a6a1571685f796e4b0a2b499d80d23535a81 /source3/printing | |
| parent | 150fb8ea588d012a31837884d2843ad3040ce0c9 (diff) | |
| download | samba-f59bd268945960ddd90fccf7cf7b077e1bdf41f2.tar.gz samba-f59bd268945960ddd90fccf7cf7b077e1bdf41f2.tar.bz2 samba-f59bd268945960ddd90fccf7cf7b077e1bdf41f2.zip | |
Merge of 64-bit printf warning fixes.
(This used to be commit a6cc763333943bc6e360bb7e78cf9bfb1bc936e8)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 16 | ||||
| -rw-r--r-- | source3/printing/print_generic.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 0b4fa93b5a..f3c3a0389a 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -739,8 +739,8 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 /* Note: DOS_HEADER_SIZE < malloc'ed PE_HEADER_SIZE */ if ((byte_count = vfs_read_data(fsp, buf, DOS_HEADER_SIZE)) < DOS_HEADER_SIZE) { - DEBUG(3,("get_file_version: File [%s] DOS header too short, bytes read = %d\n", - fname, byte_count)); + DEBUG(3,("get_file_version: File [%s] DOS header too short, bytes read = %lu\n", + fname, (unsigned long)byte_count)); goto no_version_info; } @@ -760,8 +760,8 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 } if ((byte_count = vfs_read_data(fsp, buf, PE_HEADER_SIZE)) < PE_HEADER_SIZE) { - DEBUG(3,("get_file_version: File [%s] Windows header too short, bytes read = %d\n", - fname, byte_count)); + DEBUG(3,("get_file_version: File [%s] Windows header too short, bytes read = %lu\n", + fname, (unsigned long)byte_count)); /* Assume this isn't an error... the file just looks sort of like a PE/NE file */ goto no_version_info; } @@ -794,8 +794,8 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 } if ((byte_count = vfs_read_data(fsp, buf, section_table_bytes)) < section_table_bytes) { - DEBUG(3,("get_file_version: PE file [%s] Section header too short, bytes read = %d\n", - fname, byte_count)); + DEBUG(3,("get_file_version: PE file [%s] Section header too short, bytes read = %lu\n", + fname, (unsigned long)byte_count)); goto error_exit; } @@ -825,8 +825,8 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 } if ((byte_count = vfs_read_data(fsp, buf, section_bytes)) < section_bytes) { - DEBUG(3,("get_file_version: PE file [%s] .rsrc section too short, bytes read = %d\n", - fname, byte_count)); + DEBUG(3,("get_file_version: PE file [%s] .rsrc section too short, bytes read = %lu\n", + fname, (unsigned long)byte_count)); goto error_exit; } diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 0b062ebdd9..1c847448da 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -164,7 +164,7 @@ static int generic_job_submit(int snum, struct printjob *pjob) pstrcpy(jobname, pjob->jobname); pstring_sub(jobname, "'", "_"); slprintf(job_page_count, sizeof(job_page_count)-1, "%d", pjob->page_count); - slprintf(job_size, sizeof(job_size)-1, "%d", pjob->size); + slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size); /* send it to the system spooler */ ret = print_run_command(snum, |