kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

formatting fixes (bug #4770)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6185 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-07-25 15:32:06 +00:00
parent 4f007c8192
commit 32a267db40
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
loader.c
View File

@@ -43,6 +43,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define RTLD_NOW 0 #define RTLD_NOW 0
#endif #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[] = static char expected_key[] =
{ 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75, { 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75,
0xff, 0x8b, 0xa9, 0xbe, 0x7c, 0x43, 0x74, 0x63 }; 0xff, 0x8b, 0xa9, 0xbe, 0x7c, 0x43, 0x74, 0x63 };
@@ -59,13 +65,18 @@ struct module {
struct module *next; struct module *next;
}; };
static struct loadupdate {
int (*updater)(void);
struct loadupdate *next;
} *updaters = NULL;
static int printdigest(unsigned char *d) static int printdigest(unsigned char *d)
{ {
int x; int x;
char buf[256]; char buf[256];
char buf2[16]; char buf2[16];
snprintf(buf, sizeof(buf), "Unexpected signature:"); snprintf(buf, sizeof(buf), "Unexpected signature:");
for (x=0;x<16;x++) { for (x=0; x<16; x++) {
snprintf(buf2, sizeof(buf2), " %02x", *(d++)); snprintf(buf2, sizeof(buf2), " %02x", *(d++));
strcat(buf, buf2); strcat(buf, buf2);
} }
@@ -78,7 +89,7 @@ static int key_matches(char *key1, char *key2)
{ {
int match = 1; int match = 1;
int x; int x;
for (x=0;x<16;x++) { for (x=0; x<16; x++) {
match &= (key1[x] == key2[x]); match &= (key1[x] == key2[x]);
} }
return match; return match;
@@ -97,17 +108,6 @@ static int verify_key(char *key)
return -1; 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) int ast_unload_resource(const char *resource_name, int force)
{ {
struct module *m, *ml = NULL; 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; struct module *m;
int which=0; int which=0;
char *ret; char *ret;
if (pos != rpos) if (pos != rpos)
return NULL; return NULL;
ast_mutex_lock(&modlock); ast_mutex_lock(&modlock);
@@ -502,8 +503,9 @@ int load_modules(const int preload_only)
DIR *mods; DIR *mods;
struct dirent *d; struct dirent *d;
int x; int x;
/* Loop through each order */ /* Loop through each order */
for (x=0;x<sizeof(loadorder) / sizeof(loadorder[0]);x++) { for (x=0; x<sizeof(loadorder) / sizeof(loadorder[0]); x++) {
mods = opendir((char *)ast_config_AST_MODULE_DIR); mods = opendir((char *)ast_config_AST_MODULE_DIR);
if (mods) { if (mods) {
while((d = readdir(mods))) { while((d = readdir(mods))) {
@@ -531,7 +533,7 @@ int load_modules(const int preload_only)
} }
} }
if (option_debug && !option_verbose) if (option_debug && !option_verbose)
ast_log(LOG_DEBUG, "Loading module %s\n", d->d_name); ast_log(LOG_DEBUG, "Loading module %s\n", d->d_name);
if (option_verbose) { if (option_verbose) {
ast_verbose( VERBOSE_PREFIX_1 "[%s]", term_color(tmp, d->d_name, COLOR_BRWHITE, 0, sizeof(tmp))); ast_verbose( VERBOSE_PREFIX_1 "[%s]", term_color(tmp, d->d_name, COLOR_BRWHITE, 0, sizeof(tmp)));