diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 14:53:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-06 01:47:43 +0200 |
| commit | 6aa12fcb30c8f7246fd0215b1d808191c0d87668 (patch) | |
| tree | 92eb805ea2ed03b1e42f6ce55ca26a65a92761fb /source3/printing | |
| parent | 48166468fe3ca515dae3431bbe674809489f743c (diff) | |
| download | samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.gz samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.bz2 samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.zip | |
build: Remove SMB_OFF_T, replace with off_t
Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 6 | ||||
| -rw-r--r-- | source3/printing/printspoolss.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 92aa320b71..96947f199b 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -199,7 +199,7 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 } /* Skip OEM header (if any) and the DOS stub to start of Windows header */ - if (SMB_VFS_LSEEK(fsp, SVAL(buf,DOS_HEADER_LFANEW_OFFSET), SEEK_SET) == (SMB_OFF_T)-1) { + if (SMB_VFS_LSEEK(fsp, SVAL(buf,DOS_HEADER_LFANEW_OFFSET), SEEK_SET) == (off_t)-1) { DEBUG(3,("get_file_version: File [%s] too short, errno = %d\n", fname, errno)); /* Assume this isn't an error... the file just looks sort of like a PE/NE file */ @@ -222,7 +222,7 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 /* Just skip over optional header to get to section table */ if (SMB_VFS_LSEEK(fsp, SVAL(buf,PE_HEADER_OPTIONAL_HEADER_SIZE)-(NE_HEADER_SIZE-PE_HEADER_SIZE), - SEEK_CUR) == (SMB_OFF_T)-1) { + SEEK_CUR) == (off_t)-1) { DEBUG(3,("get_file_version: File [%s] Windows optional header too short, errno = %d\n", fname, errno)); goto error_exit; @@ -266,7 +266,7 @@ static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 } /* Seek to the start of the .rsrc section info */ - if (SMB_VFS_LSEEK(fsp, section_pos, SEEK_SET) == (SMB_OFF_T)-1) { + if (SMB_VFS_LSEEK(fsp, section_pos, SEEK_SET) == (off_t)-1) { DEBUG(3,("get_file_version: PE file [%s] too short for section info, errno = %d\n", fname, errno)); goto error_exit; diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c index 32f33c6348..2cb805d146 100644 --- a/source3/printing/printspoolss.c +++ b/source3/printing/printspoolss.c @@ -223,7 +223,7 @@ done: int print_spool_write(files_struct *fsp, const char *data, uint32_t size, - SMB_OFF_T offset, uint32_t *written) + off_t offset, uint32_t *written) { SMB_STRUCT_STAT st; ssize_t n; |