[svn-commits] kpfleming: trunk r44323 - in /trunk: ./ include/ main/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Oct  3 19:26:21 2006
New Revision: 44323

URL: http://svn.digium.com/view/asterisk?rev=44323&view=rev
Log:
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())

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/include/asterisk.h
    trunk/main/asterisk.c
    trunk/main/loader.c
    trunk/main/term.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=44323&r1=44322&r2=44323&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Oct  3 19:26:21 2006
@@ -136,8 +136,8 @@
 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)

Modified: trunk/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk.h?rev=44323&r1=44322&r2=44323&view=diff
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Tue Oct  3 19:26:21 2006
@@ -57,7 +57,7 @@
 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 */

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?rev=44323&r1=44322&r2=44323&view=diff
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue Oct  3 19:26:21 2006
@@ -2577,7 +2577,7 @@
 	}
 #endif
 
-	term_init();
+	ast_term_init();
 	printf(term_end());
 	fflush(stdout);
 

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?rev=44323&r1=44322&r2=44323&view=diff
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Tue Oct  3 19:26:21 2006
@@ -360,7 +360,7 @@
 	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 @@
 	   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 @@
 	*/
 #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 @@
 	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;
 	}

Modified: trunk/main/term.c
URL: http://svn.digium.com/view/asterisk/trunk/main/term.c?rev=44323&r1=44322&r2=44323&view=diff
==============================================================================
--- trunk/main/term.c (original)
+++ trunk/main/term.c Tue Oct  3 19:26:21 2006
@@ -72,7 +72,7 @@
 	return a + b * 256;
 }
 
-int term_init(void)
+int ast_term_init(void)
 {
 	char *term = getenv("TERM");
 	char termfile[256] = "";