kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

svn did me dirty for some reason. Left 5 files out of the commit; Tilghman copied them in from the branch, but I had made changes to these. Here they are.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-08-16 16:50:58 +00:00
parent 80f49f0ac8
commit c11e482cc8
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
utils/conf2ael.c
View File

@@ -1,7 +1,7 @@
/* /*
* Asterisk -- An open source telephony toolkit. * Asterisk -- An open source telephony toolkit.
* *
* Copyright (C) 2006, Digium, Inc. * Copyright (C) 2007, Digium, Inc.
* *
* Steve Murphy <murf@digium.com> * Steve Murphy <murf@digium.com>
* *
@@ -59,18 +59,6 @@
void get_start_stop(unsigned int *word, int bitsperword, int totalbits, int *start, int *end); void get_start_stop(unsigned int *word, int bitsperword, int totalbits, int *start, int *end);
int all_bits_set(unsigned int *word, int bitsperword, int totalbits); int all_bits_set(unsigned int *word, int bitsperword, int totalbits);
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
{
va_list vars;
va_start(vars,fmt);
printf("LOG: lev:%d file:%s line:%d func: %s ",
level, file, line, function);
vprintf(fmt, vars);
fflush(stdout);
va_end(vars);
}
extern char *days[]; extern char *days[];
extern char *months[]; extern char *months[];
char ast_config_AST_CONFIG_DIR[PATH_MAX]; char ast_config_AST_CONFIG_DIR[PATH_MAX];
@@ -107,21 +95,23 @@ void ast_unregister_file_version(void)
/* if(!no_comp) /* if(!no_comp)
printf("Executed ast_unregister_file_version();\n"); */ printf("Executed ast_unregister_file_version();\n"); */
/* I'm erasing this, because I don't think anyone really ever needs to see it anyway */ /* I'm erasing this, because I don't think anyone really ever needs to see it anyway */
} }
/* experiment 1: see if it's easier just to use existing config code
* to read in the extensions.conf file. In this scenario,
I have to rip/copy code from other modules, because they
are staticly declared as-is. A solution would be to move
the ripped code to another location and make them available
to other modules and standalones */
/* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */ /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6))); void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
{
va_list vars;
va_start(vars,fmt);
printf("LOG: lev:%d file:%s line:%d func: %s ",
level, file, line, function);
vprintf(fmt, vars);
fflush(stdout);
va_end(vars);
}
/* stolen from pbx.c */ /* stolen from pbx.c */
struct ast_context; struct ast_context;
struct ast_app; struct ast_app;
@@ -369,11 +359,11 @@ int main(int argc, char **argv)
printf(" The result will most likely need careful attention to\n"); printf(" The result will most likely need careful attention to\n");
printf(" finish the job!!!!!\n"); printf(" finish the job!!!!!\n");
strcpy(ast_config_AST_CONFIG_DIR,"/etc/asterisk"); strcpy(ast_config_AST_CONFIG_DIR,"/etc/asterisk");
printf("Loading %s/%s...\n", ast_config_AST_CONFIG_DIR, config); printf("Loading %s/%s...\n", ast_config_AST_CONFIG_DIR, config);
localized_use_conf_dir();
localized_pbx_load_module(); localized_pbx_load_module();
printf("... Done!\n"); printf("... Done!\n");
@@ -383,11 +373,6 @@ int main(int argc, char **argv)
printf("Context: %s\n", tmp->name); printf("Context: %s\n", tmp->name);
} }
printf("=========\n"); printf("=========\n");
printf("Sizeof(context)=%d\n", (int)sizeof(struct ast_context));
printf("Sizeof(exten)=%d\n", (int)sizeof(struct ast_exten));
printf("Sizeof(include)=%d\n", (int)sizeof(struct ast_include));
printf("Sizeof(ignorepat)=%d\n", (int)sizeof(struct ast_ignorepat));
printf("Sizeof(sw)=%d\n", (int)sizeof(struct ast_sw));
tmp = 0; tmp = 0;
while ((tmp = localized_walk_contexts(tmp)) ) { while ((tmp = localized_walk_contexts(tmp)) ) {
/* printf("Context: %s\n", tmp->name); */ /* printf("Context: %s\n", tmp->name); */

2
utils/extconf.c
View File

@@ -959,6 +959,8 @@ extern int ast_language_is_prefix;
struct ast_mutex_info { struct ast_mutex_info {
pthread_mutex_t mutex; pthread_mutex_t mutex;
/*! Track which thread holds this lock */
unsigned int track:1;
const char *file[AST_MAX_REENTRANCY]; const char *file[AST_MAX_REENTRANCY];
int lineno[AST_MAX_REENTRANCY]; int lineno[AST_MAX_REENTRANCY];
int reentrancy; int reentrancy;