Skip to content
Snippets Groups Projects
Commit 82883698 authored by Russell Bryant's avatar Russell Bryant
Browse files

more fixes for gcc4 warnings ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent b870642e
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -260,7 +260,7 @@ void ast_md5_hash(char *output, char *input)
int x;
MD5Init(&md5);
MD5Update(&md5, input, strlen(input));
MD5Update(&md5, (unsigned char *)input, strlen(input));
MD5Final(digest, &md5);
ptr = output;
for (x=0; x<16; x++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment