astobj2: Only define ao2_bt() once.

* Make ao2_bt() not use single char variable names.

* Fix ao2_bt() formatting.
........

Merged revisions 398498 from http://svn.asterisk.org/svn/asterisk/branches/12


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

main/astobj2.c

@@ -114,27 +114,28 @@ struct ao2_stats {
 static struct ao2_stats ao2;
 #endif
 
-#ifndef HAVE_BKTR	/* backtrace support */
+#ifdef HAVE_BKTR
-void ao2_bt(void) {}
-#else
 #include <execinfo.h>    /* for backtrace */
+#endif
 
 void ao2_bt(void)
 {
-	int c, i;
+#ifdef HAVE_BKTR
+	int depth;
+	int idx;
 #define N1	20
 	void *addresses[N1];
 	char **strings;
 
-	c = backtrace(addresses, N1);
+	depth = backtrace(addresses, N1);
-	strings = ast_bt_get_symbols(addresses,c);
+	strings = ast_bt_get_symbols(addresses, depth);
-	ast_verbose("backtrace returned: %d\n", c);
+	ast_verbose("backtrace returned: %d\n", depth);
-	for(i = 0; i < c; i++) {
+	for (idx = 0; idx < depth; ++idx) {
-		ast_verbose("%d: %p %s\n", i, addresses[i], strings[i]);
+		ast_verbose("%d: %p %s\n", idx, addresses[idx], strings[idx]);
 	}
 	ast_std_free(strings);
-}
 #endif
+}
 
 #define INTERNAL_OBJ_MUTEX(user_data) \
 	((struct astobj2_lock *) (((char *) (user_data)) - sizeof(struct astobj2_lock)))