Fix compiler warnings (bug #3367)
authorMark Spencer <markster@digium.com>
Tue, 18 Jan 2005 11:40:44 +0000 (11:40 +0000)
committerMark Spencer <markster@digium.com>
Tue, 18 Jan 2005 11:40:44 +0000 (11:40 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4832 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_modem.c
formats/format_g723.c

index 6bd5c6c..bbbac0a 100755 (executable)
@@ -791,6 +791,7 @@ static struct ast_channel *modem_request(const char *type, int format, void *dat
        struct ast_channel *tmp = NULL;
        char dev[80];
        ast_group_t group = 0;
+       int groupint;
        char *stringp=NULL;
        strncpy(dev, (char *)data, sizeof(dev)-1);
        stringp=dev;
@@ -799,11 +800,11 @@ static struct ast_channel *modem_request(const char *type, int format, void *dat
 
        if (dev[0]=='g' && isdigit(dev[1])) {
                /* Retrieve the group number */
-               if (sscanf(dev+1, "%u", &group) < 1) {
+               if (sscanf(dev+1, "%u", &groupint) < 1) {
                        ast_log(LOG_WARNING, "Unable to determine group from [%s]\n", (char *)data);
                        return NULL;
                }
-               group = 1 << group;
+               group = 1 << groupint;
        }
 
        /* Search for an unowned channel */
index 1c02ada..0b061c2 100755 (executable)
@@ -160,7 +160,6 @@ static void g723_close(struct ast_filestream *s)
 
 static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
 {
-       struct timeval now;
        u_int32_t delay;
        u_int16_t size;
        int res;