more fixes for gcc4 warnings

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6297 65c4cc65-6c06-0410-ace0-fbb531ad65f3

dns.c

@@ -71,7 +71,7 @@ struct dn_answer {
 	unsigned short size;
 } __attribute__ ((__packed__));
 
-static int skip_name(u_char *s, int len)
+static int skip_name(char *s, int len)
 {
 	int x = 0;
 
@@ -96,10 +96,10 @@ static int skip_name(u_char *s, int len)
 
 /*--- dns_parse_answer: Parse DNS lookup result, call callback */
 static int dns_parse_answer(void *context,
-	int class, int type, u_char *answer, int len,
+	int class, int type, char *answer, int len,
-	int (*callback)(void *context, u_char *answer, int len, u_char *fullanswer))
+	int (*callback)(void *context, char *answer, int len, char *fullanswer))
 {
-	u_char *fullanswer = answer;
+	char *fullanswer = answer;
 	struct dn_answer *ans;
 	dns_HEADER *h;
 	int res;
@@ -169,7 +169,7 @@ AST_MUTEX_DEFINE_STATIC(res_lock);
 /*--- ast_search_dns: Lookup record in DNS */
 int ast_search_dns(void *context,
 	   const char *dname, int class, int type,
-	   int (*callback)(void *context, u_char *answer, int len, u_char *fullanswer))
+	   int (*callback)(void *context, char *answer, int len, char *fullanswer))
 {
 #ifdef HAS_RES_NINIT
 	struct __res_state dnsstate;
@@ -179,7 +179,7 @@ int ast_search_dns(void *context,
 
 #ifdef HAS_RES_NINIT
 	res_ninit(&dnsstate);
-	res = res_nsearch(&dnsstate, dname, class, type, answer, sizeof(answer));
+	res = res_nsearch(&dnsstate, dname, class, type, (unsigned char *)answer, sizeof(answer));
 #else
 	ast_mutex_lock(&res_lock);
 	res_init();

enum.c

@@ -67,7 +67,7 @@ struct naptr {
 } __attribute__ ((__packed__));
 
 /*--- parse_ie: Parse NAPTR record information elements */
-static int parse_ie(unsigned char *data, int maxdatalen, unsigned char *src, int srclen)
+static int parse_ie(char *data, int maxdatalen, char *src, int srclen)
 {
 	int len, olen;
 
@@ -85,17 +85,17 @@ static int parse_ie(unsigned char *data, int maxdatalen, unsigned char *src, int
 }
 
 /*--- parse_naptr: Parse DNS NAPTR record used in ENUM ---*/
-static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize, unsigned char *answer, int len, char *naptrinput)
+static int parse_naptr(char *dst, int dstsize, char *tech, int techsize, char *answer, int len, char *naptrinput)
 {
-	unsigned char *oanswer = answer;
+	char *oanswer = answer;
-	unsigned char flags[80] = "";
+	char flags[80] = "";
-	unsigned char services[80] = "";
+	char services[80] = "";
-	unsigned char regexp[80] = "";
+	char regexp[80] = "";
-	unsigned char repl[80] = "";
+	char repl[80] = "";
-	unsigned char temp[80] = "";
+	char temp[80] = "";
-	unsigned char delim;
+	char delim;
-	unsigned char *delim2;
+	char *delim2;
-	unsigned char *pattern, *subst, *d;
+	char *pattern, *subst, *d;
 	int res;
 	int regexp_len, size, backref;
 	int d_len = sizeof(temp) - 1;
@@ -132,7 +132,7 @@ static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize
 		answer += res; 
 		len -= res; 
 	}
-	if ((res = dn_expand(oanswer,answer + len,answer, repl, sizeof(repl) - 1)) < 0) {
+	if ((res = dn_expand((unsigned char *)oanswer, (unsigned char *)answer + len, (unsigned char *)answer, repl, sizeof(repl) - 1)) < 0) {
 		ast_log(LOG_WARNING, "Failed to expand hostname\n");
 		return -1;
 	} 
@@ -260,7 +260,7 @@ struct enum_context {
 };
 
 /*--- txt_callback: Callback for TXT record lookup */
-static int txt_callback(void *context, u_char *answer, int len, u_char *fullanswer)
+static int txt_callback(void *context, char *answer, int len, char *fullanswer)
 {
 	struct enum_context *c = (struct enum_context *)context;
 #if 0
@@ -295,7 +295,7 @@ static int txt_callback(void *context, u_char *answer, int len, u_char *fullansw
 }
 
 /*--- enum_callback: Callback from ENUM lookup function */
-static int enum_callback(void *context, u_char *answer, int len, u_char *fullanswer)
+static int enum_callback(void *context, char *answer, int len, char *fullanswer)
 {
 	struct enum_context *c = (struct enum_context *)context;
 

include/asterisk/dns.h

@@ -22,6 +22,6 @@ struct ast_channel;
 	\param	callback Callback function for handling DNS result
 */
 extern int ast_search_dns(void *context, const char *dname, int class, int type,
-	 int (*callback)(void *context, u_char *answer, int len, u_char *fullanswer));
+	 int (*callback)(void *context, char *answer, int len, char *fullanswer));
 
 #endif /* _ASTERISK_DNS_H */