summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-24 09:49:26 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-28 13:10:28 +0200
commit1935b7b6c223542c1807e275c44e6ba4b2e90b68 (patch)
tree3f3c92eb3a080d3f68761f1431176e99c4046dbb /source4/torture
parent7cf00e3231da1808a5ad1adf8fbc319846eacabe (diff)
downloadsamba-1935b7b6c223542c1807e275c44e6ba4b2e90b68.tar.gz
samba-1935b7b6c223542c1807e275c44e6ba4b2e90b68.tar.bz2
samba-1935b7b6c223542c1807e275c44e6ba4b2e90b68.zip
lib/util Rename init_module_fn to samba_init_module_fn
This prepares for making the samba_module.h header public again, for OpenChange. I am keen to avoid too much API namespace pollution if we can.
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/smbtorture.c2
-rw-r--r--source4/torture/torture.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 934e0a7b2f..b2bd4c6749 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -602,7 +602,7 @@ int main(int argc,char *argv[])
}
if (extra_module != NULL) {
- init_module_fn fn = load_module(poptGetOptArg(pc), false, NULL);
+ samba_init_module_fn fn = load_module(poptGetOptArg(pc), false, NULL);
if (fn == NULL)
d_printf("Unable to load module from %s\n", poptGetOptArg(pc));
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index b066d3e1ac..155a346956 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -48,8 +48,8 @@ _PUBLIC_ int torture_init(void)
{
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_smbtorture_MODULES_PROTO;
- init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
- init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
+ samba_init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
+ samba_init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
run_init_functions(static_init);
run_init_functions(shared_init);