diff options
| author | Tim Potter <tpot@samba.org> | 2003-04-14 03:59:04 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-04-14 03:59:04 +0000 |
| commit | 5f82e261c664707a57c94424b7db20040c65237d (patch) | |
| tree | 79ff2ed60ea988f2cab1897c16079cb26bdf0228 /source3/utils/testparm.c | |
| parent | c89a7057e5334ab8dadb4a847c2dc74434c1cc49 (diff) | |
| download | samba-5f82e261c664707a57c94424b7db20040c65237d.tar.gz samba-5f82e261c664707a57c94424b7db20040c65237d.tar.bz2 samba-5f82e261c664707a57c94424b7db20040c65237d.zip | |
Merge:
- Jelmer's latest popt changes
(This used to be commit 6a54d9a0a77c71664dc6cdbed1adf492c28c0cce)
Diffstat (limited to 'source3/utils/testparm.c')
| -rw-r--r-- | source3/utils/testparm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index ec58f906ed..5f3a7de1c7 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -180,15 +180,12 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_ return ret; } -int main(int argc, const char *argv[]) + int main(int argc, const char *argv[]) { - extern char *optarg; - extern int optind; const char *config_file = dyn_CONFIGFILE; int s; static BOOL silent_mode = False; int ret = 0; - int opt; poptContext pc; static const char *term_code = ""; static char *new_local_machine = NULL; @@ -202,15 +199,15 @@ int main(int argc, const char *argv[]) {"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"}, {"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"}, {"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"}, - {NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, - {0,0,0,0} + POPT_COMMON_VERSION + POPT_TABLEEND }; pc = poptGetContext(NULL, argc, argv, long_options, POPT_CONTEXT_KEEP_FIRST); poptSetOtherOptionHelp(pc, "[OPTION...] <config-file> [host-name] [host-ip]"); - while((opt = poptGetNextOpt(pc)) != -1); + while(poptGetNextOpt(pc) != -1); setup_logging(poptGetArg(pc), True); |