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

Merged revisions 44322 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines

ensure that local include files are always used
avoid a duplicate function name (term_init())

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-10-04 00:26:21 +00:00
parent 7294ba3852
commit 41eb95e055
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -136,8 +136,8 @@ HTTP_CGIDIR=/var/www/cgi-bin
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts) GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
MOD_SUBDIR_CFLAGS=-I../include MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
OTHER_SUBDIR_CFLAGS=-I../include OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
ifeq ($(OSARCH),linux-gnu) ifeq ($(OSARCH),linux-gnu)
ifeq ($(PROC),x86_64) ifeq ($(PROC),x86_64)

2
include/asterisk.h
View File

@@ -57,7 +57,7 @@ int init_logger(void); /*!< Provided by logger.c */
void close_logger(void); /*!< Provided by logger.c */ void close_logger(void); /*!< Provided by logger.c */
int reload_logger(int); /*!< Provided by logger.c */ int reload_logger(int); /*!< Provided by logger.c */
int init_framer(void); /*!< Provided by frame.c */ int init_framer(void); /*!< Provided by frame.c */
int term_init(void); /*!< Provided by term.c */ int ast_term_init(void); /*!< Provided by term.c */
int astdb_init(void); /*!< Provided by db.c */ int astdb_init(void); /*!< Provided by db.c */
void ast_channels_init(void); /*!< Provided by channel.c */ void ast_channels_init(void); /*!< Provided by channel.c */
void ast_builtins_init(void); /*!< Provided by cli.c */ void ast_builtins_init(void); /*!< Provided by cli.c */

2
main/asterisk.c
View File

@@ -2577,7 +2577,7 @@ int main(int argc, char *argv[])
} }
#endif #endif
term_init(); ast_term_init();
printf(term_end()); printf(term_end());
fflush(stdout); fflush(stdout);

7
main/loader.c
View File

@@ -360,7 +360,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
strcpy(resource_being_loaded->resource, resource); strcpy(resource_being_loaded->resource, resource);
if (!(lib = dlopen(fn, RTLD_LAZY | RTLD_LOCAL))) { if (!(lib = dlopen(fn, RTLD_LAZY | RTLD_LOCAL))) {
ast_log(LOG_WARNING, "%s\n", dlerror()); ast_log(LOG_WARNING, "Error loading module '%s': %s\n", resource_in, dlerror());
free(resource_being_loaded); free(resource_being_loaded);
return NULL; return NULL;
} }
@@ -373,6 +373,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
module_list module_list
*/ */
if (resource_being_loaded != (mod = AST_LIST_LAST(&module_list))) { if (resource_being_loaded != (mod = AST_LIST_LAST(&module_list))) {
ast_log(LOG_WARNING, "Module '%s' did not register itself during load\n", resource_in);
/* no, it did not, so close it and return */ /* no, it did not, so close it and return */
while (!dlclose(lib)); while (!dlclose(lib));
/* note that the module's destructor will call ast_module_unregister(), /* note that the module's destructor will call ast_module_unregister(),
@@ -395,7 +396,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
*/ */
#if HAVE_RTLD_NOLOAD #if HAVE_RTLD_NOLOAD
if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) { if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) {
ast_log(LOG_WARNING, "%s\n", dlerror()); ast_log(LOG_WARNING, "Unable to promot flags on module '%s': %s\n", resource_in, dlerror());
while (!dlclose(lib)); while (!dlclose(lib));
free(resource_being_loaded); free(resource_being_loaded);
return NULL; return NULL;
@@ -412,7 +413,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
strcpy(resource_being_loaded->resource, resource); strcpy(resource_being_loaded->resource, resource);
if (!(lib = dlopen(fn, wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) { if (!(lib = dlopen(fn, wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) {
ast_log(LOG_WARNING, "%s\n", dlerror()); ast_log(LOG_WARNING, "Error loading module '%s': %s\n", resource_in, dlerror());
free(resource_being_loaded); free(resource_being_loaded);
return NULL; return NULL;
} }

2
main/term.c
View File

@@ -72,7 +72,7 @@ static short convshort(char *s)
return a + b * 256; return a + b * 256;
} }
int term_init(void) int ast_term_init(void)
{ {
char *term = getenv("TERM"); char *term = getenv("TERM");
char termfile[256] = ""; char termfile[256] = "";