From 1b7cc4ac7c793d4c1829d842c84273ef2d081fdb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 25 Oct 2011 07:43:06 +1100 Subject: lib/util Rename samba_init_module_fn -> samba_module_init_fn This is to provide a cleaner namespace in the public samba plugin functions. Andrew Bartlett --- source4/auth/ntlm/auth.c | 2 +- source4/ntptr/ntptr_base.c | 4 ++-- source4/ntvfs/ntvfs_base.c | 4 ++-- source4/ntvfs/posix/pvfs_acl.c | 4 ++-- source4/ntvfs/sysdep/sys_lease.c | 2 +- source4/ntvfs/sysdep/sys_notify.c | 2 +- source4/param/share.c | 2 +- source4/rpc_server/dcerpc_server.c | 4 ++-- source4/smbd/process_model.c | 4 ++-- source4/smbd/server.c | 4 ++-- source4/torture/smbtorture.c | 2 +- source4/torture/torture.c | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) (limited to 'source4') diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 0a3122673e..f2f9f26eeb 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -660,7 +660,7 @@ _PUBLIC_ NTSTATUS auth4_init(void) static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_auth4_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_auth4_MODULES }; + samba_module_init_fn static_init[] = { STATIC_auth4_MODULES }; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c index 7b16986655..b452fd8015 100644 --- a/source4/ntptr/ntptr_base.c +++ b/source4/ntptr/ntptr_base.c @@ -73,8 +73,8 @@ NTSTATUS ntptr_init(void) { #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_ntptr_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_ntptr_MODULES }; - samba_init_module_fn *shared_init = samba_modules_load(NULL, "ntptr"); + samba_module_init_fn static_init[] = { STATIC_ntptr_MODULES }; + samba_module_init_fn *shared_init = samba_modules_load(NULL, "ntptr"); samba_init_module_fns_run(static_init); samba_init_module_fns_run(shared_init); diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index 25cbfc1194..efa1968de8 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -230,8 +230,8 @@ NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx) static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_ntvfs_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_ntvfs_MODULES }; - samba_init_module_fn *shared_init; + samba_module_init_fn static_init[] = { STATIC_ntvfs_MODULES }; + samba_module_init_fn *shared_init; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index d809095224..2372b440fd 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -87,8 +87,8 @@ NTSTATUS pvfs_acl_init(void) static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_pvfs_acl_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_pvfs_acl_MODULES }; - samba_init_module_fn *shared_init; + samba_module_init_fn static_init[] = { STATIC_pvfs_acl_MODULES }; + samba_module_init_fn *shared_init; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index f95e02a578..5e8a70fdad 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -113,7 +113,7 @@ _PUBLIC_ NTSTATUS sys_lease_init(void) static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_sys_lease_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_sys_lease_MODULES }; + samba_module_init_fn static_init[] = { STATIC_sys_lease_MODULES }; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index 71ffda2bac..dd143d36b4 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -137,7 +137,7 @@ _PUBLIC_ NTSTATUS sys_notify_init(void) static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_sys_notify_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_sys_notify_MODULES }; + samba_module_init_fn static_init[] = { STATIC_sys_notify_MODULES }; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/param/share.c b/source4/param/share.c index 67759369bd..5204e83fb4 100644 --- a/source4/param/share.c +++ b/source4/param/share.c @@ -149,7 +149,7 @@ NTSTATUS share_init(void) { #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_share_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_share_MODULES }; + samba_module_init_fn static_init[] = { STATIC_share_MODULES }; samba_init_module_fns_run(static_init); diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 94e628f9bf..53eafe0723 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -1228,8 +1228,8 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx) static bool initialized; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_dcerpc_server_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES }; - samba_init_module_fn *shared_init; + samba_module_init_fn static_init[] = { STATIC_dcerpc_server_MODULES }; + samba_module_init_fn *shared_init; if (initialized) { return; diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index 710246cf8b..e43e9146d8 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; - samba_init_module_fn static_init[] = { STATIC_process_model_MODULES }; - samba_init_module_fn *shared_init; + samba_module_init_fn static_init[] = { STATIC_process_model_MODULES }; + samba_module_init_fn *shared_init; static bool initialised; if (initialised) { diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 1da472155d..abc662de79 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; - samba_init_module_fn static_init[] = { STATIC_service_MODULES }; - samba_init_module_fn *shared_init; + samba_module_init_fn static_init[] = { STATIC_service_MODULES }; + samba_module_init_fn *shared_init; struct tevent_context *event_ctx; uint16_t stdin_event_flags; NTSTATUS status; diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 9620605174..8122c14964 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) { - samba_init_module_fn fn = load_module(poptGetOptArg(pc), false, NULL); + samba_module_init_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 e270818dce..fafc79a36f 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; - samba_init_module_fn static_init[] = { STATIC_smbtorture_MODULES }; - samba_init_module_fn *shared_init = samba_modules_load(NULL, "smbtorture"); + samba_module_init_fn static_init[] = { STATIC_smbtorture_MODULES }; + samba_module_init_fn *shared_init = samba_modules_load(NULL, "smbtorture"); samba_init_module_fns_run(static_init); samba_init_module_fns_run(shared_init); -- cgit