diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-07 06:47:20 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-07 06:47:20 +0000 |
commit | f849d31d292cae3516a38c14fb554db8896469f6 (patch) | |
tree | 16376271dcb6da4822b3cb0c9d7b99030d30211c | |
parent | 65b5377c36f1bfc1d3937cd7ac8e9629ac7c3855 (diff) |
more fixes for gcc4 warnings ...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6298 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | srv.c | 10 | ||||
-rwxr-xr-x | utils.c | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -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++) |