From fd5783657e6faae9dfb769e31fe1ec8491d3eec1 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 4 Oct 2007 21:38:22 +0000 Subject: Merged revisions 84690 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r84690 | kpfleming | 2007-10-04 16:36:56 -0500 (Thu, 04 Oct 2007) | 2 lines callers of sig2str already add the word 'signalling' in the appropriate place, so don't duplicate it ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84691 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index c8aa34cb2..f3815e38e 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1359,25 +1359,25 @@ static char *zap_sig2str(int sig) case SIG_FXOKS: return "FXO Kewlstart"; case SIG_PRI: - return "PRI Signalling"; + return "ISDN PRI"; case SIG_SS7: - return "SS7 Signalling"; + return "SS7"; case SIG_SF: - return "SF (Tone) Signalling Immediate"; + return "SF (Tone) Immediate"; case SIG_SFWINK: - return "SF (Tone) Signalling Wink"; + return "SF (Tone) Wink"; case SIG_SF_FEATD: - return "SF (Tone) Signalling with Feature Group D (DTMF)"; + return "SF (Tone) with Feature Group D (DTMF)"; case SIG_SF_FEATDMF: - return "SF (Tone) Signalling with Feature Group D (MF)"; + return "SF (Tone) with Feature Group D (MF)"; case SIG_SF_FEATB: - return "SF (Tone) Signalling with Feature Group B (MF)"; + return "SF (Tone) with Feature Group B (MF)"; case SIG_GR303FXOKS: - return "GR-303 Signalling with FXOKS"; + return "GR-303 with FXOKS"; case SIG_GR303FXSKS: - return "GR-303 Signalling with FXSKS"; + return "GR-303 with FXSKS"; case 0: - return "Pseudo Signalling"; + return "Pseudo"; default: snprintf(buf, sizeof(buf), "Unknown signalling %d", sig); return buf; -- cgit v1.2.3