diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:05:21 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | ecc822faf8f1e2f34573aabef381a846b08afeec (patch) | |
| tree | ca210e7c68e116f1f7606b274f156365109c0d54 | |
| parent | 900473a45b90c44e5f301feae42f821214228e27 (diff) | |
| download | samba-ecc822faf8f1e2f34573aabef381a846b08afeec.tar.gz samba-ecc822faf8f1e2f34573aabef381a846b08afeec.tar.bz2 samba-ecc822faf8f1e2f34573aabef381a846b08afeec.zip | |
build: Remove sys_telldir wrapper
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/system.c | 9 | ||||
| -rw-r--r-- | source3/modules/onefs_dir.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c8db7bd02c..1d400efdff 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -338,7 +338,6 @@ 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); void kernel_flock(int fd, uint32 share_mode, uint32 access_mask); SMB_STRUCT_DIR *sys_fdopendir(int fd); -long sys_telldir(SMB_STRUCT_DIR *dirp); void sys_rewinddir(SMB_STRUCT_DIR *dirp); int sys_closedir(SMB_STRUCT_DIR *dirp); int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); diff --git a/source3/lib/system.c b/source3/lib/system.c index 7a2e1bc38c..d650862a39 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -634,15 +634,6 @@ SMB_STRUCT_DIR *sys_fdopendir(int fd) } /******************************************************************* - A telldir wrapper. -********************************************************************/ - -long sys_telldir(SMB_STRUCT_DIR *dirp) -{ - return (long)telldir(dirp); -} - -/******************************************************************* A rewinddir wrapper. ********************************************************************/ diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c index da60ff388e..77b34beeea 100644 --- a/source3/modules/onefs_dir.c +++ b/source3/modules/onefs_dir.c @@ -480,7 +480,7 @@ onefs_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) if (!lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE, PARM_USE_READDIRPLUS, PARM_USE_READDIRPLUS_DEFAULT)) { - return sys_telldir(dirp); + return telldir(dirp); } /* Retrieve state based off DIR handle */ diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index e9ff7cb8bc..d7a85beff9 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -394,7 +394,7 @@ static long vfswrap_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) { long result; START_PROFILE(syscall_telldir); - result = sys_telldir(dirp); + result = telldir(dirp); END_PROFILE(syscall_telldir); return result; } |