diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:09:39 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | 6edd8e95f1ed0ac398c84e4050357097087ae15f (patch) | |
| tree | 03cd74839c3fc7f73f747a96e4f325deba10a999 | |
| parent | 3e8a6e576007892bab7d59367c5199a41fb1506d (diff) | |
| download | samba-6edd8e95f1ed0ac398c84e4050357097087ae15f.tar.gz samba-6edd8e95f1ed0ac398c84e4050357097087ae15f.tar.bz2 samba-6edd8e95f1ed0ac398c84e4050357097087ae15f.zip | |
build: Remove sys_rewinddir wrapper
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/system.c | 8 | ||||
| -rw-r--r-- | source3/modules/onefs_dir.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 37ae272e75..f6db59e14e 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); -void sys_rewinddir(SMB_STRUCT_DIR *dirp); int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); int sys_waitpid(pid_t pid,int *status,int options); char *sys_getwd(void); diff --git a/source3/lib/system.c b/source3/lib/system.c index a414c92d27..1988088ba5 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -634,14 +634,6 @@ SMB_STRUCT_DIR *sys_fdopendir(int fd) } /******************************************************************* - A rewinddir wrapper. -********************************************************************/ - -void sys_rewinddir(SMB_STRUCT_DIR *dirp) -{ - rewinddir(dirp); -} - An mknod() wrapper. ********************************************************************/ diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c index 77b34beeea..eb11b9725c 100644 --- a/source3/modules/onefs_dir.c +++ b/source3/modules/onefs_dir.c @@ -526,7 +526,7 @@ onefs_rewinddir(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_rewinddir(dirp); + return rewinddir(dirp); } /* Retrieve state based off DIR handle */ diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 965c6a26b8..31f1192af7 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -402,7 +402,7 @@ static long vfswrap_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) static void vfswrap_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) { START_PROFILE(syscall_rewinddir); - sys_rewinddir(dirp); + rewinddir(dirp); END_PROFILE(syscall_rewinddir); } |