diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-31 16:36:06 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-06-01 04:06:12 +0200 |
| commit | c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde (patch) | |
| tree | 21939b3dee3e786c9ec4c00eb6b832f2560bd371 /source3/include | |
| parent | 1cee71713f75dbee653ea86bd4e7c87efe677cf6 (diff) | |
| download | samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.tar.gz samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.tar.bz2 samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.zip | |
Remove the char * argument from the SMB_VFS_GETWD() call. Now always
returns malloc'ed memory.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Jun 1 04:06:12 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 5 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 185bc7687c..145b52c5c2 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -134,6 +134,7 @@ to split out the two possible uses. JRA. */ /* Leave at 28 - not yet released. Add fdopendir. JRA. */ /* Leave at 28 - not yet released. Rename open function to open_fn. - gd */ +/* Leave at 28 - not yet released. Make getwd function always return malloced memory. JRA. */ #define SMB_VFS_INTERFACE_VERSION 28 /* @@ -250,7 +251,7 @@ struct vfs_fn_pointers { int (*fchown)(struct vfs_handle_struct *handle, struct files_struct *fsp, uid_t uid, gid_t gid); int (*lchown)(struct vfs_handle_struct *handle, const char *path, uid_t uid, gid_t gid); int (*chdir)(struct vfs_handle_struct *handle, const char *path); - char *(*getwd)(struct vfs_handle_struct *handle, char *buf); + char *(*getwd)(struct vfs_handle_struct *handle); int (*ntimes)(struct vfs_handle_struct *handle, const struct smb_filename *smb_fname, struct smb_file_time *ft); @@ -613,7 +614,7 @@ int smb_vfs_call_fchown(struct vfs_handle_struct *handle, int smb_vfs_call_lchown(struct vfs_handle_struct *handle, const char *path, uid_t uid, gid_t gid); int smb_vfs_call_chdir(struct vfs_handle_struct *handle, const char *path); -char *smb_vfs_call_getwd(struct vfs_handle_struct *handle, char *buf); +char *smb_vfs_call_getwd(struct vfs_handle_struct *handle); int smb_vfs_call_ntimes(struct vfs_handle_struct *handle, const struct smb_filename *smb_fname, struct smb_file_time *ft); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 4b1d1d258b..c7686f1db5 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -239,10 +239,10 @@ #define SMB_VFS_NEXT_CHDIR(handle, path) \ smb_vfs_call_chdir((handle)->next, (path)) -#define SMB_VFS_GETWD(conn, buf) \ - smb_vfs_call_getwd((conn)->vfs_handles, (buf)) -#define SMB_VFS_NEXT_GETWD(handle, buf) \ - smb_vfs_call_getwd((handle)->next, (buf)) +#define SMB_VFS_GETWD(conn) \ + smb_vfs_call_getwd((conn)->vfs_handles) +#define SMB_VFS_NEXT_GETWD(handle) \ + smb_vfs_call_getwd((handle)->next) #define SMB_VFS_NTIMES(conn, path, ts) \ smb_vfs_call_ntimes((conn)->vfs_handles, (path), (ts)) |