fix compiler warnings

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

diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index e94a15ef5489ca9cc3af5ebc9173a0f1a77b979e..e9b916c6d55e244ea15e97d3793c4bf5e7818fa0 100644 (file)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -184,6 +184,7 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
        int res=0;
        struct localuser *u;
        char *temp;
+       const char *val;
        int cause;
        struct ast_osp_result result;
        int priority_jump = 0;
@@ -212,11 +213,11 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
        }
 
        cause = str2cause(args.cause);
-       temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
+       val = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
        result.handle = -1;
-       if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
-               temp = pbx_builtin_getvar_helper(chan, "OSPRESULTS");
-               if (ast_strlen_zero(temp) || (sscanf(temp, "%d", &result.numresults) != 1)) {
+       if (!ast_strlen_zero(val) && (sscanf(val, "%d", &result.handle) == 1) && (result.handle > -1)) {
+               val = pbx_builtin_getvar_helper(chan, "OSPRESULTS");
+               if (ast_strlen_zero(val) || (sscanf(val, "%d", &result.numresults) != 1)) {
                        result.numresults = 0;
                }
                if ((res = ast_osp_next(&result, cause)) > 0) {
@@ -255,6 +256,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data)
        int res=0;
        struct localuser *u;
        char *temp;
+       const char *val;
        int cause;
        time_t start=0, duration=0;
        struct ast_osp_result result;
@@ -293,9 +295,9 @@ static int ospfinished_exec(struct ast_channel *chan, void *data)
                ast_log(LOG_WARNING, "OSPFinish called on channel '%s' with no CDR!\n", chan->name);
        
        cause = str2cause(args.status);
-       temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
+       val = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
        result.handle = -1;
-       if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
+       if (!ast_strlen_zero(val) && (sscanf(val, "%d", &result.handle) == 1) && (result.handle > -1)) {
                if (!ast_osp_terminate(result.handle, cause, start, duration)) {
                        pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
                        pbx_builtin_setvar_helper(chan, "OSPFINISHSTATUS", "SUCCESS");

diff --git a/codecs/gsm/inc/private.h b/codecs/gsm/inc/private.h
index 24f0b42b28791627ba935ef81c964eb120d9bd21..7021030aca30346d154d88f8100e06afd818c924 100644 (file)
--- a/codecs/gsm/inc/private.h
+++ b/codecs/gsm/inc/private.h
@@ -149,17 +149,17 @@ static __inline__ short GSM_SUB(short a, short b)
                  : (utmp = (ulongword)(a) + (ulongword)(b)) >= MAX_LONGWORD \
                    ? MAX_LONGWORD : utmp))
 
-static inline word GSM_ADD(a, b)
+static inline word GSM_ADD(longword a, longword b)
 {
        register longword ltmp;
-       ltmp = (longword) (a) + (longword) (b);
+       ltmp = a + b;
        return (word)((ulongword) (ltmp - MIN_WORD) > MAX_WORD - MIN_WORD ? (ltmp > 0 ? MAX_WORD : MIN_WORD) : ltmp);
 };
 
-static inline word GSM_SUB(a, b)
+static inline word GSM_SUB(longword a, longword b)
 {
        register longword ltmp;
-       ltmp = (longword) (a) - (longword) (b);
+       ltmp = a - b;
        return (word)(ltmp >= MAX_WORD ? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp);
 };
 

diff --git a/dnsmgr.c b/dnsmgr.c
index 4fb699e95569c2543aa1d36bd41b2484a4f9a413..db4c5dfd3d4d27f948c95fc0d8022b7b58bb7281 100644 (file)
--- a/dnsmgr.c
+++ b/dnsmgr.c
@@ -303,7 +303,6 @@ static int do_reload(int loading)
        const char *enabled_value;
        int interval;
        int was_enabled;
-       pthread_attr_t attr;
        int res = -1;
 
        /* ensure that no refresh cycles run while the reload is in progress */