various compiler warning fixes (bug #4483)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Kevin P. Fleming 21 years ago
parent 0db4cee117
commit 7584fac64b

@ -65,7 +65,6 @@ LOCAL_USER_DECL;
#define CONF_SIZE 160 #define CONF_SIZE 160
static struct ast_channel *get_zap_channel_locked(int num) { static struct ast_channel *get_zap_channel_locked(int num) {
struct ast_channel *c=NULL;
char name[80]; char name[80];
snprintf(name,sizeof(name),"Zap/%d-1",num); snprintf(name,sizeof(name),"Zap/%d-1",num);

@ -8162,6 +8162,7 @@ static void check_pendings(struct sip_pvt *p)
/*--- handle_response_register: Handle responses on REGISTER to services ---*/ /*--- 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) 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; struct sip_registry *r;
r=p->registry; 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); ast_set_flag(p, SIP_NEEDDESTROY);
return 0; return 0;
} }
int expires, expires_ms;
r->regstate=REG_STATE_REGISTERED; 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)); manager_event(EVENT_FLAG_SYSTEM, "Registry", "Channel: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));

@ -866,12 +866,12 @@ static struct skinny_device {
struct skinny_device *next; struct skinny_device *next;
} *devices = NULL; } *devices = NULL;
static struct skinny_paging_device { struct skinny_paging_device {
char name[80]; char name[80];
char id[16]; char id[16];
struct skinny_device ** devices; struct skinny_device ** devices;
struct skinny_paging_device *next; struct skinny_paging_device *next;
} *paging_devices = NULL; };
static struct skinnysession { static struct skinnysession {
pthread_t t; pthread_t t;
@ -3118,7 +3118,6 @@ static int reload_config(void)
char *cat; char *cat;
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
struct skinny_device *d; struct skinny_device *d;
struct skinny_paging_device *p;
int oldport = ntohs(bindaddr.sin_port); int oldport = ntohs(bindaddr.sin_port);
#if 0 #if 0

Loading…
Cancel
Save