From 82883698cc51b6c72a2519e3829ded032a19ba34 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 7 Aug 2005 06:47:20 +0000
Subject: [PATCH] more fixes for gcc4 warnings ...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
srv.c | 10 +++++-----
utils.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srv.c b/srv.c
index f7d23533b8..8a73544a5c 100755
--- a/srv.c
+++ b/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;
diff --git a/utils.c b/utils.c
index 1054203de0..bf231d818c 100755
--- a/utils.c
+++ b/utils.c
@@ -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++)
--
GitLab