sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-01 05:47:28 +03:00
Code

r18168: Use {NULL} rather than POPT_TABLEEND, which is not always available.

Browse Source 
(This used to be commit 8b622c5ded0732df0eaf9f6226f52a27b6eacd73)
This commit is contained in:
Jelmer Vernooij 2006-09-06 12:28:01 +00:00 committed by Gerald (Jerry) Carter
parent f057742ef3
commit 873749f218
18 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/client/cifsdd.c
View File

@ -516,7 +516,7 @@ struct poptOption cifsddHelpOptions[] = {
{ NULL, '\0', POPT_ARG_CALLBACK, (void *)&cifsdd_help_message, '\0', NULL, NULL },
{ "help", '?', 0, NULL, '?', "Show this help message", NULL },
{ "usage", '\0', 0, NULL, 'u', "Display brief usage message", NULL },
POPT_TABLEEND
{ NULL }
} ;
int main(int argc, const char ** argv)
@ -533,7 +533,7 @@ int main(int argc, const char ** argv)
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
/* Block sizes. */

2
source4/client/client.c
View File

@ -3090,7 +3090,7 @@ static int do_message_op(const char *desthost, const char *destip, int name_type
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
mem_ctx = talloc_init("client.c/main");

5
source4/include/core.h
View File

@ -26,11 +26,6 @@
#include "libcli/util/nt_status.h"
typedef bool BOOL;
#define False false
#define True true
/* used to hold an arbitrary blob of data */
typedef struct datablob {
uint8_t *data;

6
source4/lib/cmdline/popt_common.c
View File

@ -151,7 +151,7 @@ struct poptOption popt_common_connection[] = {
{ "workgroup", 'W', POPT_ARG_STRING, NULL, 'W', "Set the workgroup name", "WORKGROUP" },
{ "scope", 'i', POPT_ARG_STRING, NULL, 'i', "Use this Netbios scope", "SCOPE" },
{ "maxprotocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set max protocol level", "MAXPROTOCOL" },
POPT_TABLEEND
{ NULL }
};
struct poptOption popt_common_samba[] = {
@ -163,12 +163,12 @@ struct poptOption popt_common_samba[] = {
{ "log-basename", 'l', POPT_ARG_STRING, NULL, 'l', "Basename for log/debug files", "LOGFILEBASE" },
{ "leak-report", 0, POPT_ARG_NONE, NULL, OPT_LEAK_REPORT, "enable talloc leak reporting on exit", NULL },
{ "leak-report-full",0, POPT_ARG_NONE, NULL, OPT_LEAK_REPORT_FULL, "enable full talloc leak reporting on exit", NULL },
POPT_TABLEEND
{ NULL }
};
struct poptOption popt_common_version[] = {
{ NULL, 0, POPT_ARG_CALLBACK, popt_common_callback },
{ "version", 'V', POPT_ARG_NONE, NULL, 'V', "Print version" },
POPT_TABLEEND
{ NULL }
};

4
source4/lib/cmdline/popt_common.h
View File

@ -29,10 +29,6 @@ extern struct poptOption popt_common_connection[];
extern struct poptOption popt_common_version[];
extern struct poptOption popt_common_credentials[];
#ifndef POPT_TABLEEND
#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
#endif
#define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },
#define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL },
#define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },

2
source4/lib/cmdline/popt_credentials.c
View File

@ -145,5 +145,5 @@ struct poptOption popt_common_credentials[] = {
{ "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" },
{ "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos" },
{ "use-security-mechanisms", 0, POPT_ARG_STRING, NULL, OPT_GENSEC_MECHS, "Restricted list of authentication mechanisms available for use with this authentication"},
POPT_TABLEEND
{ NULL }
};

2
source4/lib/ldb/tools/cmdline.c
View File

@ -75,7 +75,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
#endif
POPT_TABLEEND
{ NULL }
};
ldb_global_init();

2
source4/lib/registry/tools/regdiff.c
View File

@ -43,7 +43,7 @@ int main(int argc, char **argv)
POPT_COMMON_SAMBA
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
registry_init();

2
source4/lib/registry/tools/regpatch.c
View File

@ -39,7 +39,7 @@ int main(int argc, char **argv)
{"remote", 'R', POPT_ARG_STRING, &remote, 0, "connect to specified remote server", NULL},
POPT_COMMON_SAMBA
POPT_COMMON_CREDENTIALS
POPT_TABLEEND
{ NULL }
};
pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);

2
source4/lib/registry/tools/regshell.c
View File

@ -419,7 +419,7 @@ static char **reg_completion(const char *text, int start, int end)
POPT_COMMON_SAMBA
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);

2
source4/lib/registry/tools/regtree.c
View File

@ -96,7 +96,7 @@ int main(int argc, char **argv)
{"no-values", 'V', POPT_ARG_NONE, &no_values, 0, "don't show values", NULL},
POPT_COMMON_SAMBA
POPT_COMMON_CREDENTIALS
POPT_TABLEEND
{ NULL }
};
pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);

2
source4/smbd/server.c
View File

@ -185,7 +185,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
"set maximum runtime of the server process, till autotermination", "seconds"},
POPT_COMMON_SAMBA
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
pc = poptGetContext(binary_name, argc, argv, long_options, 0);

2
source4/torture/smbiconv.c
View File

@ -183,7 +183,7 @@ int main(int argc, char *argv[])
{ "to-code", 't', POPT_ARG_STRING, &to, 0, "Encoding for output" },
{ "output", 'o', POPT_ARG_STRING, &output, 0, "Write output to this file" },
{ "preload-modules", 'p', POPT_ARG_STRING, &preload_modules[0], 0, "Modules to load" },
POPT_TABLEEND
{ NULL }
};
setlinebuf(stdout);

2
source4/torture/smbtorture.c
View File

@ -410,7 +410,7 @@ const static struct torture_ui_ops quiet_ui_ops = {
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
#ifdef HAVE_SETBUFFER

2
source4/utils/ndrdump.c
View File

@ -153,7 +153,7 @@ const struct dcerpc_interface_table *load_iface_from_plugin(const char *plugin,
{"load-dso", 'l', POPT_ARG_STRING, &plugin, 0, "load from shared object file", NULL },
POPT_COMMON_SAMBA
POPT_AUTOHELP
POPT_TABLEEND
{ NULL }
};
dcerpc_table_init();

2
source4/utils/net/net.c
View File

@ -148,7 +148,7 @@ static int binary_net(int argc, const char **argv)
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
#ifdef HAVE_SETBUFFER

2
source4/utils/ntlm_auth.c
View File

@ -1005,7 +1005,7 @@ int main(int argc, const char **argv)
{ "multiplex", 0, POPT_ARG_NONE, &opt_multiplex, OPT_MULTIPLEX, "Multiplex Mode"},
POPT_COMMON_SAMBA
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
/* Samba client initialisation */

2
source4/utils/testparm.c
View File

@ -106,7 +106,7 @@ static int do_global_checks(void)
{"client-ip", '\0', POPT_ARG_STRING, &caddr, 0, "Client IP address for 'hosts allow' checking"},
POPT_COMMON_SAMBA
POPT_COMMON_VERSION
POPT_TABLEEND
{ NULL }
};
setup_logging(NULL, DEBUG_STDERR);