Merged revisions 44322 via svnmerge from

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

diff --git a/Makefile b/Makefile
index fc130f6ec0f6de7e71e18c273b8bf239ef823ec9..c7e8031b8aac74b59556bd990d35fc9836fedf2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -136,8 +136,8 @@ HTTP_CGIDIR=/var/www/cgi-bin
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-MOD_SUBDIR_CFLAGS=-I../include
-OTHER_SUBDIR_CFLAGS=-I../include
+MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
 
 ifeq ($(OSARCH),linux-gnu)
   ifeq ($(PROC),x86_64)

diff --git a/include/asterisk.h b/include/asterisk.h
index 9b18733b1d1595162fc0fd22fda205cf66fef48a..a2fee3e57d530c06d0577b22d04ea940ea30c63d 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -57,7 +57,7 @@ int init_logger(void);                                /*!< Provided by logger.c */
 void close_logger(void);                       /*!< Provided by logger.c */
 int reload_logger(int);                                /*!< Provided by logger.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 */
 void ast_channels_init(void);                  /*!< Provided by channel.c */
 void ast_builtins_init(void);                  /*!< Provided by cli.c */

diff --git a/main/asterisk.c b/main/asterisk.c
index d86e66a5b2a0863f08e95b1e284f6e7327bc5f32..456370143c114e84e8aff83ef8f5d211ffebd29f 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2577,7 +2577,7 @@ int main(int argc, char *argv[])
        }
 #endif
 
-       term_init();
+       ast_term_init();
        printf(term_end());
        fflush(stdout);
 

diff --git a/main/loader.c b/main/loader.c
index 8b149f2d709de7b46410b42733bcfadf6d72595c..dd33f9b1e171fb0ee31d598dad902441cfb5e8d0 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -360,7 +360,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
        strcpy(resource_being_loaded->resource, resource);
 
        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);
                return NULL;
        }
@@ -373,6 +373,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
           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 */
                while (!dlclose(lib));
                /* 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 (!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));
                free(resource_being_loaded);
                return NULL;
@@ -412,7 +413,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
        strcpy(resource_being_loaded->resource, resource);
 
        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);
                return NULL;
        }

diff --git a/main/term.c b/main/term.c
index 7240c80b1c13799f60729de6d557518863c505ee..a38399eda4a0617d560c70b730353df099eb4e1c 100644 (file)
--- a/main/term.c
+++ b/main/term.c
@@ -72,7 +72,7 @@ static short convshort(char *s)
        return a + b * 256;
 }
 
-int term_init(void)
+int ast_term_init(void)
 {
        char *term = getenv("TERM");
        char termfile[256] = "";