diff options
| author | Tim Potter <tpot@samba.org> | 2003-02-25 23:52:38 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-02-25 23:52:38 +0000 |
| commit | 1aeede25e87d192edaa18a5305f4539b90440025 (patch) | |
| tree | eef59a5f18c350c2f1f681b121e7bf9d2a4efd23 /source3/torture | |
| parent | 1788f806e7655aa37cff22eaa6f3f424fb779274 (diff) | |
| download | samba-1aeede25e87d192edaa18a5305f4539b90440025.tar.gz samba-1aeede25e87d192edaa18a5305f4539b90440025.tar.bz2 samba-1aeede25e87d192edaa18a5305f4539b90440025.zip | |
Merge: const fixes.
Merge: add popt_common_version to command line options table.
(This used to be commit 5f8a008a52b115ed423464faa264f1b7ab86a1e2)
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/vfstest.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index c9410e5adb..04f31656d3 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -124,7 +124,7 @@ static NTSTATUS cmd_conf(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, /* Display help on commands */ static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, - int argc, char **argv) + int argc, const char **argv) { struct cmd_list *tmp; struct cmd_set *tmp_set; @@ -495,6 +495,7 @@ int main(int argc, char *argv[]) {"command", 'c', POPT_ARG_STRING, &cmdstr, 0, "Execute specified list of commands" }, {"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Write output to specified logfile" }, { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, + { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, { 0, 0, 0, 0} }; |