mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
formatting fixes (bug #4770)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6185 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
24
loader.c
24
loader.c
@@ -43,6 +43,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#define RTLD_NOW 0
|
||||
#endif
|
||||
|
||||
AST_MUTEX_DEFINE_STATIC(modlock);
|
||||
AST_MUTEX_DEFINE_STATIC(reloadlock);
|
||||
|
||||
static struct module *module_list=NULL;
|
||||
static int modlistver = 0;
|
||||
|
||||
static char expected_key[] =
|
||||
{ 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75,
|
||||
0xff, 0x8b, 0xa9, 0xbe, 0x7c, 0x43, 0x74, 0x63 };
|
||||
@@ -59,6 +65,11 @@ struct module {
|
||||
struct module *next;
|
||||
};
|
||||
|
||||
static struct loadupdate {
|
||||
int (*updater)(void);
|
||||
struct loadupdate *next;
|
||||
} *updaters = NULL;
|
||||
|
||||
static int printdigest(unsigned char *d)
|
||||
{
|
||||
int x;
|
||||
@@ -97,17 +108,6 @@ static int verify_key(char *key)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static struct loadupdate {
|
||||
int (*updater)(void);
|
||||
struct loadupdate *next;
|
||||
} *updaters = NULL;
|
||||
|
||||
AST_MUTEX_DEFINE_STATIC(modlock);
|
||||
AST_MUTEX_DEFINE_STATIC(reloadlock);
|
||||
|
||||
static struct module *module_list=NULL;
|
||||
static int modlistver = 0;
|
||||
|
||||
int ast_unload_resource(const char *resource_name, int force)
|
||||
{
|
||||
struct module *m, *ml = NULL;
|
||||
@@ -157,6 +157,7 @@ char *ast_module_helper(char *line, char *word, int pos, int state, int rpos, in
|
||||
struct module *m;
|
||||
int which=0;
|
||||
char *ret;
|
||||
|
||||
if (pos != rpos)
|
||||
return NULL;
|
||||
ast_mutex_lock(&modlock);
|
||||
@@ -502,6 +503,7 @@ int load_modules(const int preload_only)
|
||||
DIR *mods;
|
||||
struct dirent *d;
|
||||
int x;
|
||||
|
||||
/* Loop through each order */
|
||||
for (x=0; x<sizeof(loadorder) / sizeof(loadorder[0]); x++) {
|
||||
mods = opendir((char *)ast_config_AST_MODULE_DIR);
|
||||
|
Reference in New Issue
Block a user