mirror of
https://github.com/samba-team/samba.git
synced 2025-03-24 10:50:22 +03:00
lib/util Rename samba_modules_load -> samba_module_init_fns_for_subsystem
This is to provide a cleaner namespace in the public samba plugin functions. Andrew Bartlett
This commit is contained in:
parent
b256799eaf
commit
7f8f7159af
@ -887,7 +887,7 @@ _PUBLIC_ NTSTATUS gensec_init(void)
|
||||
if (initialized) return NT_STATUS_OK;
|
||||
initialized = true;
|
||||
|
||||
shared_init = samba_modules_load(NULL, "gensec");
|
||||
shared_init = samba_module_init_fns_for_subsystem(NULL, "gensec");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -49,7 +49,7 @@ bool samba_module_init_fns_run(samba_module_init_fn *fns)
|
||||
* Will return an array of function pointers to initialization functions
|
||||
*/
|
||||
|
||||
samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem)
|
||||
samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem)
|
||||
{
|
||||
char *path = modules_path(mem_ctx, subsystem);
|
||||
samba_module_init_fn *ret;
|
||||
|
@ -44,6 +44,6 @@ bool samba_module_init_fns_run(samba_module_init_fn *fns);
|
||||
*
|
||||
* Will return an array of function pointers to initialization functions
|
||||
*/
|
||||
samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem);
|
||||
samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem);
|
||||
|
||||
#endif /* _SAMBA_MODULES_H */
|
||||
|
@ -74,7 +74,7 @@ NTSTATUS ntptr_init(void)
|
||||
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
|
||||
STATIC_ntptr_MODULES_PROTO;
|
||||
samba_module_init_fn static_init[] = { STATIC_ntptr_MODULES };
|
||||
samba_module_init_fn *shared_init = samba_modules_load(NULL, "ntptr");
|
||||
samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "ntptr");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -236,7 +236,7 @@ NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx)
|
||||
if (initialized) return NT_STATUS_OK;
|
||||
initialized = true;
|
||||
|
||||
shared_init = samba_modules_load(NULL, "ntvfs");
|
||||
shared_init = samba_module_init_fns_for_subsystem(NULL, "ntvfs");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -93,7 +93,7 @@ NTSTATUS pvfs_acl_init(void)
|
||||
if (initialized) return NT_STATUS_OK;
|
||||
initialized = true;
|
||||
|
||||
shared_init = samba_modules_load(NULL, "pvfs_acl");
|
||||
shared_init = samba_module_init_fns_for_subsystem(NULL, "pvfs_acl");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -1236,7 +1236,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
|
||||
}
|
||||
initialized = true;
|
||||
|
||||
shared_init = samba_modules_load(NULL, "dcerpc_server");
|
||||
shared_init = samba_module_init_fns_for_subsystem(NULL, "dcerpc_server");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -112,7 +112,7 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
|
||||
}
|
||||
initialised = true;
|
||||
|
||||
shared_init = samba_modules_load(NULL, "process_model");
|
||||
shared_init = samba_module_init_fns_for_subsystem(NULL, "process_model");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -409,7 +409,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
|
||||
|
||||
process_model_init(cmdline_lp_ctx);
|
||||
|
||||
shared_init = samba_modules_load(NULL, "service");
|
||||
shared_init = samba_module_init_fns_for_subsystem(NULL, "service");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
@ -49,7 +49,7 @@ _PUBLIC_ int torture_init(void)
|
||||
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
|
||||
STATIC_smbtorture_MODULES_PROTO;
|
||||
samba_module_init_fn static_init[] = { STATIC_smbtorture_MODULES };
|
||||
samba_module_init_fn *shared_init = samba_modules_load(NULL, "smbtorture");
|
||||
samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "smbtorture");
|
||||
|
||||
samba_module_init_fns_run(static_init);
|
||||
samba_module_init_fns_run(shared_init);
|
||||
|
Loading…
x
Reference in New Issue
Block a user