various compiler warning fixes (bug #4483)

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

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index a6480cb9a07c371f38bc5bb5d77bb8f4d2eed619..0ce58bbd050c3652a149906ec73d38946c4302e9 100755 (executable)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -65,7 +65,6 @@ LOCAL_USER_DECL;
 #define CONF_SIZE 160
 
 static struct ast_channel *get_zap_channel_locked(int num) {
-       struct ast_channel *c=NULL;
        char name[80];
        
        snprintf(name,sizeof(name),"Zap/%d-1",num);

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4dfc802f36eeba0f16004c82e82e22d2b0986bf4..d99ac9535b5d23318e16da7016e10569d5de53d7 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8162,6 +8162,7 @@ static void check_pendings(struct sip_pvt *p)
 /*--- handle_response_register: Handle responses on REGISTER to services ---*/
 static int handle_response_register(struct sip_pvt *p, int resp, char *rest, struct sip_request *req, int ignore, int seqno)
 {
+       int expires, expires_ms;
        struct sip_registry *r;
        r=p->registry;
 
@@ -8204,7 +8205,6 @@ static int handle_response_register(struct sip_pvt *p, int resp, char *rest, str
                        ast_set_flag(p, SIP_NEEDDESTROY);       
                        return 0;
                }
-               int expires, expires_ms;
 
                r->regstate=REG_STATE_REGISTERED;
                manager_event(EVENT_FLAG_SYSTEM, "Registry", "Channel: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 588b0b925aee9f0fce82cd46c3f09ff827c7fa7b..f70d61dc3d2cacf217a67f45d13c54a5a1a857fc 100755 (executable)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -866,12 +866,12 @@ static struct skinny_device {
        struct skinny_device *next;
 } *devices = NULL;
 
-static struct skinny_paging_device {
+struct skinny_paging_device {
        char name[80];
        char id[16];
        struct skinny_device ** devices;
        struct skinny_paging_device *next;
-} *paging_devices = NULL;
+};
 
 static struct skinnysession {
        pthread_t t;
@@ -3118,7 +3118,6 @@ static int reload_config(void)
        char *cat;
        char iabuf[INET_ADDRSTRLEN];
        struct skinny_device *d;
-       struct skinny_paging_device *p;
        int oldport = ntohs(bindaddr.sin_port);
 
 #if 0