diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /examples/VFS | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'examples/VFS')
| -rw-r--r-- | examples/VFS/skel_opaque.c | 4 | ||||
| -rw-r--r-- | examples/VFS/skel_transparent.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index c7e5295b00..48fdf37ca0 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -146,9 +146,9 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, int fi return vfswrap_lseek(NULL, fsp, filedes, offset, whence); } -static int skel_rename(vfs_handle_struct *handle, connection_struct *conn, const char *old, const char *new) +static int skel_rename(vfs_handle_struct *handle, connection_struct *conn, const char *oldname, const char *newname) { - return vfswrap_rename(NULL, conn, old, new); + return vfswrap_rename(NULL, conn, oldname, newname); } static int skel_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd) diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index b10161cde1..5f83dd417c 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -145,9 +145,9 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, int fi return SMB_VFS_NEXT_LSEEK(handle, fsp, filedes, offset, whence); } -static int skel_rename(vfs_handle_struct *handle, connection_struct *conn, const char *old, const char *new) +static int skel_rename(vfs_handle_struct *handle, connection_struct *conn, const char *oldname, const char *newname) { - return SMB_VFS_NEXT_RENAME(handle, conn, old, new); + return SMB_VFS_NEXT_RENAME(handle, conn, oldname, newname); } static int skel_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd) |