diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 12:38:31 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:08 +0200 |
| commit | 7fa1b878c1b856d732b08cfefaa1425c0cff158b (patch) | |
| tree | ded79cd0484a7800c042a21a984400a7d256d271 | |
| parent | 43e9be8894a2eaf883453de78acbade7b391a53e (diff) | |
| download | samba-7fa1b878c1b856d732b08cfefaa1425c0cff158b.tar.gz samba-7fa1b878c1b856d732b08cfefaa1425c0cff158b.tar.bz2 samba-7fa1b878c1b856d732b08cfefaa1425c0cff158b.zip | |
build: Remove sys_ftell wrapper
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/system.c | 9 | ||||
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index b3ab9714e6..ccda53faea 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -336,7 +336,6 @@ int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf, bool fake_dir_create_times); int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len); int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len); -SMB_OFF_T sys_ftell(FILE *fp); int sys_creat(const char *path, mode_t mode); int sys_open(const char *path, int oflag, mode_t mode); FILE *sys_fopen(const char *path, const char *type); diff --git a/source3/lib/system.c b/source3/lib/system.c index 08d13e6f2b..fab87da182 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -585,15 +585,6 @@ int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OF } /******************************************************************* - An ftell() wrapper. -********************************************************************/ - -SMB_OFF_T sys_ftell(FILE *fp) -{ - return (SMB_OFF_T)ftell(fp); -} - -/******************************************************************* A creat() wrapper. ********************************************************************/ diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 4c7ff57f6c..71b21fbb28 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -788,7 +788,7 @@ static bool mod_smbfilepwd_entry(struct smbpasswd_privates *smbpasswd_state, con */ status = linebuf; while (status && !feof(fp)) { - pwd_seekpos = sys_ftell(fp); + pwd_seekpos = ftell(fp); linebuf[0] = '\0'; |