summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-09 22:18:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-10-06 07:18:07 +0200
commita718b5a4f1ebfb63aec2f43b654d8e97f099fe85 (patch)
tree8aa8dc1fae736de11faa71174aef80205ad30373
parentc8945279e72aee5511739b2ce0d7ddd5535fd1cb (diff)
downloadsamba-a718b5a4f1ebfb63aec2f43b654d8e97f099fe85.tar.gz
samba-a718b5a4f1ebfb63aec2f43b654d8e97f099fe85.tar.bz2
samba-a718b5a4f1ebfb63aec2f43b654d8e97f099fe85.zip
lib/util: Use only init_module_fn typedef in module loading
-rw-r--r--lib/util/modules.c4
-rw-r--r--lib/util/samba_modules.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/util/modules.c b/lib/util/modules.c
index 5af7fa98d0..620611ff17 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 df24eb7621..06f92c5db1 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);