Merged revisions 282015 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282015 | russell | 2010-08-12 13:03:56 -0500 (Thu, 12 Aug 2010) | 2 lines

  Put back pointer value output for ast_debug(), such that it is only removed for verbose output.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282016 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 43a2e64..67163de 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6853,16 +6853,16 @@ struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts,
                *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' ; registrar: %s\n", tmp->name, registrar);
-               ast_verb(3, "Registered extension context '%s' ; registrar: %s\n", tmp->name, registrar);
+               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'; 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' ; registrar: %s\n", tmp->name, registrar);
-               ast_verb(3, "Registered extension context '%s' ; registrar: %s\n", tmp->name, registrar);
+               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'; registrar: %s\n", tmp->name, registrar);
        }
        return tmp;
 }
@@ -8194,11 +8194,11 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
        }
        if (option_debug) {
                if (tmp->matchcid) {
-                       ast_debug(1, "Added extension '%s' priority %d (CID match '%s') to %s\n",
-                                         tmp->exten, tmp->priority, tmp->cidmatch, con->name);
+                       ast_debug(1, "Added extension '%s' priority %d (CID match '%s') to %s (%p)\n",
+                                         tmp->exten, tmp->priority, tmp->cidmatch, con->name, con);
                } else {
-                       ast_debug(1, "Added extension '%s' priority %d to %s\n",
-                                         tmp->exten, tmp->priority, con->name);
+                       ast_debug(1, "Added extension '%s' priority %d to %s (%p)\n",
+                                         tmp->exten, tmp->priority, con->name, con);
                }
        }