Make sure s is initialized, make FAX_DETECT + OLD_DSP_ROUTINES build

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e997171bb6b003392e62e915da885dfe04ffb886..298708fb26ac78e468ccbac9ffe656438970a7d7 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1457,7 +1457,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
        int x, res, index;
        char *c, *n, *l;
 #ifdef ZAPATA_PRI
-       char *s;
+       char *s=NULL;
 #endif
        char callerid[256];
        char dest[256]; /* must be same length as p->dialdest */

diff --git a/dsp.c b/dsp.c
index ed90188c66c6fb16baf4adccf38a412379b2e03c..fd9282ccf348f44eeedfcb7cebc65ae0ed79f3cb 100755 (executable)
--- a/dsp.c
+++ b/dsp.c
@@ -132,9 +132,7 @@ static struct progress {
 #define DTMF_RELATIVE_PEAK_COL      6.3     /* 8dB */
 #define DTMF_2ND_HARMONIC_ROW       ((digitmode & DSP_DIGITMODE_RELAXDTMF) ? 1.7 : 2.5)     /* 4dB normal */
 #define DTMF_2ND_HARMONIC_COL       63.1    /* 18dB */
-#ifndef OLD_DSP_ROUTINES
 #define DTMF_TO_TOTAL_ENERGY       42.0
-#endif
 
 #ifdef OLD_DSP_ROUTINES
 #define MF_THRESHOLD              8.0e7