From a718b5a4f1ebfb63aec2f43b654d8e97f099fe85 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 9 Sep 2011 22:18:42 +1000 Subject: [PATCH] lib/util: Use only init_module_fn typedef in module loading --- lib/util/modules.c | 4 ++-- lib/util/samba_modules.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/util/modules.c b/lib/util/modules.c index 5af7fa98d0d..620611ff176 100644 --- a/lib/util/modules.c +++ b/lib/util/modules.c @@ -136,7 +136,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_function *init; + init_module_fn init; NTSTATUS status; const char *error; @@ -156,7 +156,7 @@ static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe) return NT_STATUS_UNSUCCESSFUL; } - init = (init_module_function *)dlsym(handle, "init_samba_module"); + init = (init_module_fn)dlsym(handle, "init_samba_module"); /* we must check dlerror() to determine if it worked, because dlsym() can validly return NULL */ diff --git a/lib/util/samba_modules.h b/lib/util/samba_modules.h index df24eb7621e..06f92c5db1a 100644 --- a/lib/util/samba_modules.h +++ b/lib/util/samba_modules.h @@ -22,7 +22,6 @@ #define _SAMBA_MODULES_H /* Module support */ -typedef NTSTATUS (init_module_function) (void); typedef NTSTATUS (*init_module_fn) (void); NTSTATUS init_samba_module(void); -- 2.34.1