mirror of
https://github.com/samba-team/samba.git
synced 2025-02-03 13:47:25 +03:00
Merge: const fixes.
Merge: add popt_common_version to command line options table. (This used to be commit 5f8a008a52b115ed423464faa264f1b7ab86a1e2)
This commit is contained in:
parent
1788f806e7
commit
1aeede25e8
@ -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}
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user