[svn-commits] russell: trunk r281983 - in /trunk: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Aug 12 11:48:54 2010
New Revision: 281983

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=281983
Log:
Merged revisions 281982 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r281982 | russell | 2010-08-12 11:33:30 -0500 (Thu, 12 Aug 2010) | 5 lines
  
  Remove debugging output from verbose messages.
  
  Pointer values to internal objects is not terribly useful to users in the
  verbose messages about adding extensions and contexts.
........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

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

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=281983&r1=281982&r2=281983
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Aug 12 11:48:54 2010
@@ -6853,16 +6853,16 @@
 		*local_contexts = tmp;
 		ast_hashtab_insert_safe(contexts_table, tmp); /*put this context into the tree */
 		ast_unlock_contexts();
-		ast_debug(1, "Registered context '%s'(%p) in table %p registrar: %s\n", tmp->name, tmp, contexts_table, registrar);
-		ast_verb(3, "Registered extension context '%s' (%p) in table %p; registrar: %s\n", tmp->name, tmp, contexts_table, registrar);
+		ast_debug(1, "Registered context '%s' ; registrar: %s\n", tmp->name, registrar);
+		ast_verb(3, "Registered extension context '%s' ; registrar: %s\n", tmp->name, registrar);
 	} else {
 		tmp->next = *local_contexts;
 		if (exttable)
 			ast_hashtab_insert_immediate(exttable, tmp); /*put this context into the tree */
 
 		*local_contexts = tmp;
-		ast_debug(1, "Registered context '%s'(%p) in local table %p; registrar: %s\n", tmp->name, tmp, exttable, registrar);
-		ast_verb(3, "Registered extension context '%s' (%p) in local table %p; registrar: %s\n", tmp->name, tmp, exttable, registrar);
+		ast_debug(1, "Registered context '%s' ; registrar: %s\n", tmp->name, registrar);
+		ast_verb(3, "Registered extension context '%s' ; registrar: %s\n", tmp->name, registrar);
 	}
 	return tmp;
 }
@@ -8194,20 +8194,20 @@
 	}
 	if (option_debug) {
 		if (tmp->matchcid) {
-			ast_debug(1, "Added extension '%s' priority %d (CID match '%s') to %s (%p)\n",
-					  tmp->exten, tmp->priority, tmp->cidmatch, con->name, con);
+			ast_debug(1, "Added extension '%s' priority %d (CID match '%s') to %s\n",
+					  tmp->exten, tmp->priority, tmp->cidmatch, con->name);
 		} else {
-			ast_debug(1, "Added extension '%s' priority %d to %s (%p)\n",
-					  tmp->exten, tmp->priority, con->name, con);
+			ast_debug(1, "Added extension '%s' priority %d to %s\n",
+					  tmp->exten, tmp->priority, con->name);
 		}
 	}
 
 	if (tmp->matchcid) {
-		ast_verb(3, "Added extension '%s' priority %d (CID match '%s') to %s (%p)\n",
-				 tmp->exten, tmp->priority, tmp->cidmatch, con->name, con);
+		ast_verb(3, "Added extension '%s' priority %d (CID match '%s') to %s\n",
+				 tmp->exten, tmp->priority, tmp->cidmatch, con->name);
 	} else {
-		ast_verb(3, "Added extension '%s' priority %d to %s (%p)\n",
-				 tmp->exten, tmp->priority, con->name, con);
+		ast_verb(3, "Added extension '%s' priority %d to %s\n",
+				 tmp->exten, tmp->priority, con->name);
 	}
 
 	return 0;