Fix some compile problems from the 'cppcheck' patch.

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ee6e0024ece52ae90ed5252b53e894af32d9bf42..e6457b1e08170ecc48e34415a3ca5c8fe75f8536 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -18898,11 +18898,17 @@ static int dahdi_sendtext(struct ast_channel *c, const char *text)
        struct pollfd fds[1];
        int size,res,fd,len,x;
        int bytes=0;
-       /* Initial carrier (imaginary) */
+       int idx;
+
+       /*
+        * Initial carrier (imaginary)
+        *
+        * Note: The following float variables are used by the
+        * PUT_CLID_MARKMS and PUT_CLID() macros.
+        */
        float cr = 1.0;
        float ci = 0.0;
        float scont = 0.0;
-       int idx;
 
        if (!text[0]) {
                return(0); /* if nothing to send, don't */

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 2bfbaddfc19faf05ce275fd030feff95d9441f29..6017ee8363444574d396861f056f6a2039e5af44 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -7504,7 +7504,7 @@ static int misdn_write(struct ast_channel *ast, struct ast_frame *frame)
 
        } else {
                /* transmit without jitterbuffer */
-               i = misdn_lib_tx2misdn_frm(ch->bc, frame->data.ptr, frame->samples);
+               misdn_lib_tx2misdn_frm(ch->bc, frame->data.ptr, frame->samples);
        }
 
        return 0;