changeset 723:b6202dea0f4d

Fix a few compilation warnings
author Sebastien Decugis <sdecugis@nict.go.jp>
date Tue, 22 Feb 2011 13:26:13 +0900
parents 6a7323cd78b3
children 42b7d6614678
files extensions/app_redirect/ard_rules.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/app_redirect/ard_rules.c	Mon Feb 21 18:31:18 2011 +0900
+++ b/extensions/app_redirect/ard_rules.c	Tue Feb 22 13:26:13 2011 +0900
@@ -102,16 +102,16 @@
 		memset(pmatch, 0, sizeof(pmatch));
 		pmatch[0].rm_so = 0;
 		pmatch[0].rm_eo = l;
-		err = regexec(&c->preg, s, 0, pmatch, REG_STARTEND);
+		err = regexec(&c->preg, (char *)s, 0, pmatch, REG_STARTEND);
 #else /* HAVE_REG_STARTEND */
 		if (!is0term) {
 			/* We have to create a copy of the string in this case */
 			char *mystrcpy;
-			CHECK_MALLOC( mystrcpy = os0dup(s, l) );
+			CHECK_MALLOC( mystrcpy = (char *)os0dup(s, l) );
 			err = regexec(&c->preg, mystrcpy, 0, NULL, 0);
 			free(mystrcpy);
 		} else {
-			err = regexec(&c->preg, s, 0, NULL, 0);
+			err = regexec(&c->preg, (char *)s, 0, NULL, 0);
 		}
 #endif /* HAVE_REG_STARTEND */
 		
@@ -183,12 +183,12 @@
 					break;
 					
 				case FROM_ID:
-					CHECK_FCT( str_match(c, phdr->info.pi_diamid, phdr->info.pi_diamidlen, 1, &is_match) );
+					CHECK_FCT( str_match(c, (uint8_t *)phdr->info.pi_diamid, phdr->info.pi_diamidlen, 1, &is_match) );
 					break;
 				
 				case FROM_REALM:
 					if (phdr->info.runtime.pir_realm) {
-						CHECK_FCT( str_match(c, phdr->info.runtime.pir_realm, phdr->info.runtime.pir_realmlen, 1, &is_match) );
+						CHECK_FCT( str_match(c, (uint8_t *)phdr->info.runtime.pir_realm, phdr->info.runtime.pir_realmlen, 1, &is_match) );
 					} else {
 						/* since we don't have the realm it was received from, assume it does not match */
 						TRACE_DEBUG(INFO, "Missing realm info for peer '%s', skipping rule %p", phdr->info.pi_diamid, r);
"Welcome to our mercurial repository"