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.

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index c38b97050f29c1abfe725d16e70fc1c9dd40cf4d..4b285c645d74ba32840631d296dadd3aead8aaf8 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_gensec_MODULES };
+       samba_init_module_fn static_init[] = { STATIC_gensec_MODULES };
 #else
-       init_module_fn *static_init = NULL;
+       samba_init_module_fn *static_init = NULL;
 #endif
-       init_module_fn *shared_init;
+       samba_init_module_fn *shared_init;
 
        if (initialized) return NT_STATUS_OK;
        initialized = true;

diff --git a/lib/util/modules.c b/lib/util/modules.c
index 52a04be457468d2aa38f52b69e11d8b401b3f833..a597191c937364e634c29a98b82d31d40dca430a 100644 (file)
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -28,7 +28,7 @@
 /**
  * Obtain the init function from a shared library file
  */
-init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
+samba_init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
 {
        void *handle;
        void *init_fn;
@@ -57,7 +57,7 @@ init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
                return NULL;
        }
 
-       init_fn = (init_module_fn)dlsym(handle, SAMBA_INIT_MODULE);
+       init_fn = (samba_init_module_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 @@ init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
                *handle_out = handle;
        }
 
-       return (init_module_fn)init_fn;
+       return (samba_init_module_fn)init_fn;
 }
 
 /**
  * Obtain list of init functions from the modules in the specified
  * directory
  */
-static init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path)
+static samba_init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path)
 {
        DIR *dir;
        struct dirent *entry;
        char *filename;
        int success = 0;
-       init_module_fn *ret = talloc_array(mem_ctx, init_module_fn, 2);
+       samba_init_module_fn *ret = talloc_array(mem_ctx, samba_init_module_fn, 2);
 
        ret[0] = NULL;
 
@@ -106,7 +106,7 @@ static 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, init_module_fn, success+2);
+                       ret = talloc_realloc(mem_ctx, ret, samba_init_module_fn, success+2);
                        success++;
                        ret[success] = NULL;
                }
@@ -124,7 +124,7 @@ static init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path)
  *
  * @return true if all functions ran successfully, false otherwise
  */
-bool run_init_functions(init_module_fn *fns)
+bool run_init_functions(samba_init_module_fn *fns)
 {
        int i;
        bool ret = true;
@@ -143,10 +143,10 @@ bool run_init_functions(init_module_fn *fns)
  * Will return an array of function pointers to initialization functions
  */
 
-init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem)
+samba_init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem)
 {
        char *path = modules_path(mem_ctx, subsystem);
-       init_module_fn *ret;
+       samba_init_module_fn *ret;
 
        ret = load_modules(mem_ctx, path);
 
@@ -162,7 +162,7 @@ init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem)
 static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe)
 {
        void *handle;
-       init_module_fn init;
+       samba_init_module_fn init;
        NTSTATUS status;
 
        init = load_module(module_name, is_probe, &handle);

diff --git a/lib/util/samba_modules.h b/lib/util/samba_modules.h
index 5eb2a0dd1cfa3a305928ecbede402aff7927d01f..5b912b39872dac998974ebe7860d13cf70d4680d 100644 (file)
--- a/lib/util/samba_modules.h
+++ b/lib/util/samba_modules.h
@@ -22,7 +22,7 @@
 #define _SAMBA_MODULES_H
 
 /* Module support */
-typedef NTSTATUS (*init_module_fn) (void);
+typedef NTSTATUS (*samba_init_module_fn) (void);
 
 NTSTATUS samba_init_module(void);
 
@@ -37,21 +37,21 @@ NTSTATUS samba_init_module(void);
  *
  * The handle to dlclose() in case of error is returns in *handle if handle is not NULL
  */
-init_module_fn load_module(const char *path, bool is_probe, void **handle);
+samba_init_module_fn load_module(const char *path, bool is_probe, void **handle);
 
 /**
  * Run the specified init functions.
  *
  * @return true if all functions ran successfully, false otherwise
  */
-bool run_init_functions(init_module_fn *fns);
+bool run_init_functions(samba_init_module_fn *fns);
 
 /**
  * Load the initialization functions from DSO files for a specific subsystem.
  *
  * Will return an array of function pointers to initialization functions
  */
-init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem);
+samba_init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem);
 
 int smb_load_modules(const char **modules);
 NTSTATUS smb_probe_module(const char *subsystem, const char *module);

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 802bc1b40fbdad1d6b3acd5c2a7484c0b98cd3e3..2d51833bd98ef0ee32561954a08c93ef57f80067 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_auth4_MODULES };
+       samba_init_module_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 3fe8960602a35dd7b135caeb4e08ed3fa67d3535..ce335c69b0227a3d2acc2f92c57faf5f7811c8e9 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_ntptr_MODULES };
-       init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
+       samba_init_module_fn static_init[] = { STATIC_ntptr_MODULES };
+       samba_init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);

diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index 8058181f89df42236731cf787224864bb3e52f9e..6f0be54c29e87c3d8adf682be38dbfecccd5de2b 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_ntvfs_MODULES };
-       init_module_fn *shared_init;
+       samba_init_module_fn static_init[] = { STATIC_ntvfs_MODULES };
+       samba_init_module_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 b253b8ab2d4f211019cf5fd98ae937d63d09efac..57bae0a02762cc553114f4f12029f347a6de88fe 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_pvfs_acl_MODULES };
-       init_module_fn *shared_init;
+       samba_init_module_fn static_init[] = { STATIC_pvfs_acl_MODULES };
+       samba_init_module_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 9adb89827422bbd62b59dfbcc4f53c8b3122510c..22fc3147b033bed8e5c0f26acd372b1efb06d235 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_sys_lease_MODULES };
+       samba_init_module_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 00300cd25a6332b4111bc96f1698a25cc50040c1..43f11a20ee90aecd7dd2ddc9a7d26a927294b2f3 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_sys_notify_MODULES };
+       samba_init_module_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 da0470d5606c5924bd2c34e95ce4e7ce60dd3eae..9e58bb73ccd7fc091571dcd683e38ab90c8e77d3 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_share_MODULES };
+       samba_init_module_fn static_init[] = { STATIC_share_MODULES };
 
        run_init_functions(static_init);
 

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index a16e6ac9d5f2e4894239ac44043f4d748d4f5d63..f2fe13dd9b80b803d5ba40d0230bd11912db7883 100644 (file)
--- 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;
-       init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
-       init_module_fn *shared_init;
+       samba_init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
+       samba_init_module_fn *shared_init;
 
        if (initialized) {
                return;

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index bbcbe3b6acc789369efdcda80dab7b794c71b9df..8080787a12c640e9bf16953eae72391639315238 100644 (file)
--- 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 86622c8be976c7834f7bd93b58971a29889ad29c..c6b9900c0e44122957dfbbd2192627f616c69cd3 100644 (file)
--- 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;

diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 934e0a7b2fa4b06d5cd84d1f3c6f35cd967db83b..b2bd4c67491f2ebf02d1e02343ee77f9c0978775 100644 (file)
--- 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 b066d3e1ac612b302de21326c2c5d09966026388..155a34695628f9221c846418390a826eb2dc0f61 100644 (file)
--- 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);