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/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 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index 8058181f89..6f0be54c29 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; - 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 b253b8ab2d..57bae0a027 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; - 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 9adb898274..22fc3147b0 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; - 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 00300cd25a..43f11a20ee 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; - 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; -- cgit