summaryrefslogtreecommitdiffstats
path: root/examples/VFS
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-06-24 20:25:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:58:00 -0500
commit9506b8e145982b1160a2f0aee5c9b7a54980940a (patch)
treed52b9e32395f5522406b64612f836c3155f69e19 /examples/VFS
parent6ff0fa0b4385481f2212047d80ca17b55d996def (diff)
downloadsamba-9506b8e145982b1160a2f0aee5c9b7a54980940a.tar.gz
samba-9506b8e145982b1160a2f0aee5c9b7a54980940a.tar.xz
samba-9506b8e145982b1160a2f0aee5c9b7a54980940a.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
Diffstat (limited to 'examples/VFS')
-rw-r--r--examples/VFS/skel_opaque.c4
-rw-r--r--examples/VFS/skel_transparent.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index c7e5295b007..48fdf37ca01 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 b10161cde19..5f83dd417c9 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)