From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 20 Oct 2014 20:12:42 +0000 (+0200)
Subject: replace strlens by breaks, fix comparison warnings.
X-Git-Tag: v9.01~115
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7ae2110eee47cd1cce79ccb9ab1e64b8ab5472ac

replace strlens by breaks, fix comparison warnings.
---

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 362d6ccf3..c2131cbff 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -183,7 +183,7 @@ void utf8ify_rfc822_string(char *buf) {
 		}
 		else if (!strcasecmp(encoding, "Q")) {	/**< quoted-printable */
 			size_t len;
-			long pos;
+			unsigned long pos;
 			
 			len = strlen(istr);
 			pos = 0;
@@ -377,7 +377,7 @@ void sanitize_truncated_recipient(char *str)
  */
 void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < strlen(name); ++i) {
 		if (name[i] == '@') {
@@ -431,10 +431,11 @@ int alias(char *name)
 			strcpy(name, &name[1]);
 		aaa[strlen(aaa) - 1] = 0;
 		strcpy(bbb, "");
-		for (a = 0; a < strlen(aaa); ++a) {
+		for (a = 0; aaa[a] != '\0'; ++a) {
 			if (aaa[a] == ',') {
 				strcpy(bbb, &aaa[a + 1]);
 				aaa[a] = 0;
+				break;
 			}
 		}
 		if (!strcasecmp(name, aaa))
@@ -452,11 +453,12 @@ int alias(char *name)
 	}
 
 	/* Change "user @ xxx" to "user" if xxx is an alias for this host */
-	for (a=0; a<strlen(name); ++a) {
+	for (a=0; name[a] != '\0'; ++a) {
 		if (name[a] == '@') {
 			if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
 				name[a] = 0;
 				MSG_syslog(LOG_INFO, "Changed to <%s>\n", name);
+				break;
 			}
 		}
 	}
@@ -1037,11 +1039,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 		strcpy(name, &name[1]);
 
 	/* and anything to the right of a @ or % */
-	for (a = 0; a < strlen(name); ++a) {
-		if (name[a] == '@')
+	for (a = 0; name[a] != '\0'; ++a) {
+		if (name[a] == '@') {
 			name[a] = 0;
-		if (name[a] == '%')
+			break;
+		}
+		if (name[a] == '%') {
 			name[a] = 0;
+			break;
+		}
 	}
 
 	/* but if there are parentheses, that changes the rules... */
@@ -1057,9 +1063,11 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 			strcpy(&name[0], &name[1]);
 		}
 		strcpy(&name[0], &name[1]);
-		for (a = 0; a < strlen(name); ++a)
-			if (name[a] == 34)
+		for (a = 0; name[a] != '\0'; ++a)
+			if (name[a] == 34) {
 				name[a] = 0;
+				break;
+			}
 	}
 	/* extract user id */
 	strcpy(user, rfc822);
@@ -1077,11 +1085,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 		strcpy(user, &user[1]);
 
 	/* and anything to the right of a @ or % */
-	for (a = 0; a < strlen(user); ++a) {
-		if (user[a] == '@')
+	for (a = 0; user[a] != '\0'; ++a) {
+		if (user[a] == '@') {
 			user[a] = 0;
-		if (user[a] == '%')
+			break;
+		}
+		if (user[a] == '%') {
 			user[a] = 0;
+			break;
+		}
 	}
 
 
@@ -1120,9 +1132,11 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 			strcpy(node, &node[1]);
 	
 		/* now get rid of the user portion of a node!user string */
-		for (a = 0; a < strlen(node); ++a)
-			if (node[a] == '!')
+		for (a = 0; node[a] != '\0'; ++a)
+			if (node[a] == '!') {
 				node[a] = 0;
+				break;
+			}
 	}
 
 	/* strip leading and trailing spaces in all strings */
diff --git a/citadel/modules/c-ares-dns/serv_c-ares-dns.c b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
index 94592a161..99131ae22 100644
--- a/citadel/modules/c-ares-dns/serv_c-ares-dns.c
+++ b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
@@ -567,8 +567,9 @@ void SockStateCb(void *data, int sock, int read, int write)
 /* already inside of the event queue. */
 	if (DebugCAres)
 	{
-		struct sockaddr_in sin = {};
+		struct sockaddr_in sin;
 		socklen_t slen;
+		memset(&sin, 0, sizeof(sin));
 		slen = sizeof(sin);
 		if ((IO->DNS.SourcePort == 0) &&
 		    (getsockname(sock, &sin, &slen) == 0))
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 42323b163..d7872aebe 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -1092,7 +1092,7 @@ void checkcrash(void)
  */
 int convert_login(char NameToConvert[]) {
 	struct passwd *pw;
-	int a;
+	unsigned int a;
 
 	pw = getpwnam(NameToConvert);
 	if (pw == NULL) {
diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index bb7f542de..85288088c 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -335,7 +335,7 @@ void important_message(const char *title, const char *msgtext)
 		printf("       %s \n\n%s\n\n", title, msgtext);
 		printf("%s", _("Press return to continue..."));
 		if (fgets(buf, sizeof buf, stdin))
-			;
+		{;}
 		break;
 
 	case UI_DIALOG:
@@ -949,9 +949,10 @@ void fixnss(void) {
 
 	while (fgets(buf, sizeof buf, fp_read) != NULL) {
 		strcpy(buf_nc, buf);
-		for (i=0; i<strlen(buf_nc); ++i) {
+		for (i=0; buf_nc[i]; ++i) {
 			if (buf_nc[i] == '#') {
 				buf_nc[i] = 0;
+				break;
 			}
 		}
 		for (i=0; i<strlen(buf_nc); ++i) {
@@ -969,7 +970,8 @@ void fixnss(void) {
 				}
 			}
 		}
-		if (write(fd_write, buf, strlen(buf)) != strlen(buf)) {
+		long buflen = strlen(buf);
+		if (write(fd_write, buf, buflen) != buflen) {
 			fclose(fp_read);
 			close(fd_write);
 			unlink(new_filename);