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 /source3/torture | |
| 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 'source3/torture')
| -rw-r--r-- | source3/torture/nbio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 4d61fa0531..16e0b4a191 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -228,9 +228,9 @@ void nb_rmdir(const char *fname) } } -void nb_rename(const char *old, const char *new) +void nb_rename(const char *oldname, const char *newname) { - if (!cli_rename(c, old, new)) { + if (!cli_rename(c, oldname, newname)) { printf("ERROR: rename %s %s failed (%s)\n", old, new, cli_errstr(c)); exit(1); |