From ce3dfd777f8f2da4cb08f6c91a465e647b84a8f1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 25 Jul 2010 13:19:34 +0200 Subject: s3: cli_qpathinfo->cli_qpathinfo1 --- source3/include/proto.h | 2 +- source3/libsmb/clirap.c | 2 +- source3/torture/nbio.c | 2 +- source3/torture/torture.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index 75e4aaf7a8..37fa0be2f1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2636,7 +2636,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, void *state); bool cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, const char *old_password); -bool cli_qpathinfo(struct cli_state *cli, +bool cli_qpathinfo1(struct cli_state *cli, const char *fname, time_t *change_time, time_t *access_time, diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index be4cc0a8fb..afea8b5d9c 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -531,7 +531,7 @@ bool cli_oem_change_password(struct cli_state *cli, const char *user, const char Send a qpathinfo call. ****************************************************************************/ -bool cli_qpathinfo(struct cli_state *cli, +bool cli_qpathinfo1(struct cli_state *cli, const char *fname, time_t *change_time, time_t *access_time, diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 054806811b..f69e4c3a2b 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -245,7 +245,7 @@ void nb_rename(const char *oldname, const char *newname) void nb_qpathinfo(const char *fname) { - cli_qpathinfo(c, fname, NULL, NULL, NULL, NULL, NULL); + cli_qpathinfo1(c, fname, NULL, NULL, NULL, NULL, NULL); } void nb_qfileinfo(int fnum) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 696aaa3769..be9cfccf98 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -2868,7 +2868,7 @@ static bool run_trans2test(int dummy) } cli_close(cli, fnum); - if (!cli_qpathinfo(cli, fname, &c_time, &a_time, &m_time, &size, NULL)) { + if (!cli_qpathinfo1(cli, fname, &c_time, &a_time, &m_time, &size, NULL)) { printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(cli)); correct = False; } else { @@ -5959,9 +5959,9 @@ static bool run_mangle1(int dummy) } cli_close(cli, fnum); - if (!cli_qpathinfo(cli, alt_name, &change_time, &access_time, + if (!cli_qpathinfo1(cli, alt_name, &change_time, &access_time, &write_time, &size, &mode)) { - d_printf("cli_qpathinfo(%s) failed: %s\n", alt_name, + d_printf("cli_qpathinfo1(%s) failed: %s\n", alt_name, cli_errstr(cli)); return false; } @@ -6485,7 +6485,7 @@ static bool run_streamerror(int dummy) return false; } - cli_qpathinfo(cli, streamname, &change_time, &access_time, &write_time, + cli_qpathinfo1(cli, streamname, &change_time, &access_time, &write_time, &size, &mode); status = cli_nt_error(cli); -- cgit