more fixes for gcc4 warnings ...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6298 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
65b5377c36
commit
f849d31d29
10
srv.c
10
srv.c
|
@ -44,7 +44,7 @@ struct srv {
|
|||
unsigned short portnum;
|
||||
} __attribute__ ((__packed__));
|
||||
|
||||
static int parse_srv(unsigned char *host, int hostlen, int *portno, unsigned char *answer, int len, unsigned char *msg)
|
||||
static int parse_srv(char *host, int hostlen, int *portno, char *answer, int len, char *msg)
|
||||
{
|
||||
int res = 0;
|
||||
struct srv *srv = (struct srv *)answer;
|
||||
|
@ -57,7 +57,7 @@ static int parse_srv(unsigned char *host, int hostlen, int *portno, unsigned cha
|
|||
answer += sizeof(struct srv);
|
||||
len -= sizeof(struct srv);
|
||||
|
||||
if ((res = dn_expand(msg,answer + len,answer, repl, sizeof(repl) - 1)) < 0) {
|
||||
if ((res = dn_expand((unsigned char *)msg, (unsigned char *)answer + len, (unsigned char *)answer, repl, sizeof(repl) - 1)) < 0) {
|
||||
ast_log(LOG_WARNING, "Failed to expand hostname\n");
|
||||
return -1;
|
||||
}
|
||||
|
@ -70,9 +70,9 @@ static int parse_srv(unsigned char *host, int hostlen, int *portno, unsigned cha
|
|||
}
|
||||
if (portno)
|
||||
*portno = ntohs(srv->portnum);
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
return(-1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
struct srv_context {
|
||||
|
@ -81,7 +81,7 @@ struct srv_context {
|
|||
int *port;
|
||||
};
|
||||
|
||||
static int srv_callback(void *context, u_char *answer, int len, u_char *fullanswer)
|
||||
static int srv_callback(void *context, char *answer, int len, char *fullanswer)
|
||||
{
|
||||
struct srv_context *c = (struct srv_context *)context;
|
||||
|
||||
|
|
Reference in New Issue