From: James Golovich <james@gnuinter.net>
Date: Wed, 27 Oct 2004 14:41:55 +0000 (+0000)
Subject: Backport chan_zap.c part of bug 2703 to 1.0
X-Git-Tag: 1.0.11.1~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e9087357b5b41b9db7cf2cbace293c6383ec881;p=thirdparty%2Fasterisk.git

Backport chan_zap.c part of bug 2703 to 1.0


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index efe6e39f9c..6745575a6a 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -8258,10 +8258,19 @@ static int handle_pri_show_span(int fd, int argc, char *argv[])
 	}
 	for(x=0;x<NUM_DCHANS;x++) {
 		if (pris[span-1].dchannels[x]) {
+			char *info_str = NULL;
 			ast_cli(fd, "%s D-channel: %d\n", pri_order(x), pris[span-1].dchannels[x]);
 			build_status(status, sizeof(status), pris[span-1].dchanavail[x], pris[span-1].dchans[x] == pris[span-1].pri);
 			ast_cli(fd, "Status: %s\n", status);
+#ifdef PRI_DUMP_INFO_STR
+			info_str = pri_dump_info_str(pris[span-1].pri);
+			if (info_str) {
+				ast_cli(fd, "%s", info_str);
+				free(info_str);
+			}
+#else
 			pri_dump_info(pris[span-1].pri);
+#endif
 			ast_cli(fd, "\n");
 		}
 	}