aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xchannels/chan_modem.c5
-rwxr-xr-xformats/format_g723.c1
2 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index 6bd5c6cd3..bbbac0a99 100755
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -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 */
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 1c02ada17..0b061c20f 100755
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -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;