From: Andrew Bartlett Date: Mon, 24 Oct 2011 20:43:06 +0000 (+1100) Subject: lib/util Rename samba_init_module_fn -> samba_module_init_fn X-Git-Url: http://git.samba.org/samba.git/?p=garming%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=1b7cc4ac7c793d4c1829d842c84273ef2d081fdb 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 --- diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c index d7a6dafe6f4..78141334bfe 100644 --- a/auth/gensec/gensec_start.c +++ b/auth/gensec/gensec_start.c @@ -878,11 +878,11 @@ _PUBLIC_ NTSTATUS gensec_init(void) #define _MODULE_PROTO(init) extern NTSTATUS init(void); #ifdef STATIC_gensec_MODULES STATIC_gensec_MODULES_PROTO; - samba_init_module_fn static_init[] = { STATIC_gensec_MODULES }; + samba_module_init_fn static_init[] = { STATIC_gensec_MODULES }; #else - samba_init_module_fn *static_init = NULL; + samba_module_init_fn *static_init = NULL; #endif - samba_init_module_fn *shared_init; + samba_module_init_fn *shared_init; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/lib/util/internal_module.c b/lib/util/internal_module.c index 04c02f07600..b5156fd9e2d 100644 --- a/lib/util/internal_module.c +++ b/lib/util/internal_module.c @@ -28,7 +28,7 @@ /** * Obtain the init function from a shared library file */ -samba_init_module_fn load_module(const char *path, bool is_probe, void **handle_out) +samba_module_init_fn load_module(const char *path, bool is_probe, void **handle_out) { void *handle; void *init_fn; @@ -57,7 +57,7 @@ samba_init_module_fn load_module(const char *path, bool is_probe, void **handle_ return NULL; } - init_fn = (samba_init_module_fn)dlsym(handle, SAMBA_INIT_MODULE); + init_fn = (samba_module_init_fn)dlsym(handle, SAMBA_INIT_MODULE); /* we could check dlerror() to determine if it worked, because dlsym() can validly return NULL, but what would we do with @@ -75,20 +75,20 @@ samba_init_module_fn load_module(const char *path, bool is_probe, void **handle_ *handle_out = handle; } - return (samba_init_module_fn)init_fn; + return (samba_module_init_fn)init_fn; } /** * Obtain list of init functions from the modules in the specified * directory */ -samba_init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path) +samba_module_init_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path) { DIR *dir; struct dirent *entry; char *filename; int success = 0; - samba_init_module_fn *ret = talloc_array(mem_ctx, samba_init_module_fn, 2); + samba_module_init_fn *ret = talloc_array(mem_ctx, samba_module_init_fn, 2); ret[0] = NULL; @@ -106,7 +106,7 @@ samba_init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path) ret[success] = load_module(filename, true, NULL); if (ret[success]) { - ret = talloc_realloc(mem_ctx, ret, samba_init_module_fn, success+2); + ret = talloc_realloc(mem_ctx, ret, samba_module_init_fn, success+2); success++; ret[success] = NULL; } @@ -125,7 +125,7 @@ samba_init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path) static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe) { void *handle; - samba_init_module_fn init; + samba_module_init_fn init; NTSTATUS status; init = load_module(module_name, is_probe, &handle); diff --git a/lib/util/internal_module.h b/lib/util/internal_module.h index 7d1acc52a34..9cbddeae032 100644 --- a/lib/util/internal_module.h +++ b/lib/util/internal_module.h @@ -28,7 +28,7 @@ * * The handle to dlclose() in case of error is returns in *handle if handle is not NULL */ -samba_init_module_fn load_module(const char *path, bool is_probe, void **handle); +samba_module_init_fn load_module(const char *path, bool is_probe, void **handle); int smb_load_modules(const char **modules); NTSTATUS smb_probe_module(const char *subsystem, const char *module); @@ -37,6 +37,6 @@ NTSTATUS smb_probe_module(const char *subsystem, const char *module); * Obtain list of init functions from the modules in the specified * directory */ -samba_init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path); +samba_module_init_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path); #endif /* _INTERNAL_MODULES_H */ diff --git a/lib/util/samba_module.c b/lib/util/samba_module.c index f555eea8b64..fd3da7552e1 100644 --- a/lib/util/samba_module.c +++ b/lib/util/samba_module.c @@ -30,7 +30,7 @@ * * @return true if all functions ran successfully, false otherwise */ -bool samba_init_module_fns_run(samba_init_module_fn *fns) +bool samba_init_module_fns_run(samba_module_init_fn *fns) { int i; bool ret = true; @@ -49,10 +49,10 @@ bool samba_init_module_fns_run(samba_init_module_fn *fns) * Will return an array of function pointers to initialization functions */ -samba_init_module_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem) +samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem) { char *path = modules_path(mem_ctx, subsystem); - samba_init_module_fn *ret; + samba_module_init_fn *ret; ret = load_modules(mem_ctx, path); diff --git a/lib/util/samba_module.h b/lib/util/samba_module.h index 32b5c4b6ad0..0bdf35fa10c 100644 --- a/lib/util/samba_module.h +++ b/lib/util/samba_module.h @@ -22,7 +22,7 @@ #define _SAMBA_MODULES_H /* Module support */ -typedef NTSTATUS (*samba_init_module_fn) (void); +typedef NTSTATUS (*samba_module_init_fn) (void); NTSTATUS samba_init_module(void); @@ -37,13 +37,13 @@ NTSTATUS samba_init_module(void); * * @return true if all functions ran successfully, false otherwise */ -bool samba_init_module_fns_run(samba_init_module_fn *fns); +bool samba_module_init_fns_run(samba_module_init_fn *fns); /** * Load the initialization functions from DSO files for a specific subsystem. * * Will return an array of function pointers to initialization functions */ -samba_init_module_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem); +samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem); #endif /* _SAMBA_MODULES_H */ diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 0a3122673eb..f2f9f26eebc 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 7b16986655e..b452fd80156 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 25cbfc1194b..efa1968de82 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 d8090952244..2372b440fd4 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 f95e02a5783..5e8a70fdad1 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 71ffda2bac3..dd143d36b42 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 67759369bd5..5204e83fb49 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 94e628f9bfb..53eafe07233 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 710246cf8b6..e43e9146d85 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 1da472155dd..abc662de790 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 96206051743..8122c14964f 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 e270818dce1..fafc79a36f8 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);