From 1935b7b6c223542c1807e275c44e6ba4b2e90b68 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 24 Oct 2011 09:49:26 +1100 Subject: 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. --- source4/smbd/process_model.c | 4 ++-- source4/smbd/server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index bbcbe3b6ac..8080787a12 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -103,8 +103,8 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx) { #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_process_model_MODULES_PROTO; - init_module_fn static_init[] = { STATIC_process_model_MODULES }; - init_module_fn *shared_init; + samba_init_module_fn static_init[] = { STATIC_process_model_MODULES }; + samba_init_module_fn *shared_init; static bool initialised; if (initialised) { diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 86622c8be9..c6b9900c0e 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -292,8 +292,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ poptContext pc; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_service_MODULES_PROTO; - init_module_fn static_init[] = { STATIC_service_MODULES }; - init_module_fn *shared_init; + samba_init_module_fn static_init[] = { STATIC_service_MODULES }; + samba_init_module_fn *shared_init; struct tevent_context *event_ctx; uint16_t stdin_event_flags; NTSTATUS status; -- cgit