Mercurial > masqmail

changeset 407:164468dd0953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor refactoring.
author markus schnalke <meillo@marmaro.de>
date Wed, 29 Feb 2012 10:37:21 +0100
parents 8518fe2b0f36
children f609a05ddff8
files src/interface.c
diffstat 1 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/interface.c	Wed Feb 29 10:34:27 2012 +0100
+++ b/src/interface.c	Wed Feb 29 10:37:21 2012 +0100
@@ -30,21 +30,25 @@
 
 #ifdef SOCKADDR_OLD
 	/* here I tried to be intelligent and failed. */
-	if (isalpha(iface->address[0])) {
+	if (isalpha(*iface->address)) {
 		if ((he = gethostbyname(iface->address)) == NULL) {
-			logwrite(LOG_ALERT, "local address '%s' unknown. (deleting)\n", iface->address);
+			logwrite(LOG_ALERT, "local address '%s' unknown. "
+					"(deleting)\n", iface->address);
 			return FALSE;
 		}
 		memcpy(&(name->sin_addr), he->h_addr, sizeof(name->sin_addr));
-	} else if (isdigit(iface->address[0])) {
+	} else if (isdigit(*iface->address)) {
 		if (inet_aton(iface->address, &ia)) {
 			memcpy(&(name->sin_addr), &ia, sizeof(name->sin_addr));
 		} else {
-			logwrite(LOG_ALERT, "invalid address '%s': inet_aton() failed (deleting)\n", iface->address);
+			logwrite(LOG_ALERT, "invalid address '%s': "
+					"inet_aton() failed (deleting)\n",
+					iface->address);
 			return FALSE;
 		}
 	} else {
-		logwrite(LOG_ALERT, "invalid address '%s', should begin with a aphanumeric (deleting)\n", iface->address);
+		logwrite(LOG_ALERT, "invalid address '%s', should begin with "
+				"a aphanumeric (deleting)\n", iface->address);
 		return FALSE;
 	}
 #else
@@ -54,7 +58,8 @@
 		memcpy(&(name->sin_addr), &ia, sizeof(name->sin_addr));
 	} else {
 		if ((he = gethostbyname(iface->address)) == NULL) {
-			logwrite(LOG_ALERT, "local address '%s' unknown. (deleting)\n", iface->address);
+			logwrite(LOG_ALERT, "local address '%s' unknown. "
+					"(deleting)\n", iface->address);
 			return FALSE;
 		}
 		memcpy(&(name->sin_addr), he->h_addr, sizeof(name->sin_addr));
@@ -83,7 +88,8 @@
 
 	if (init_sockaddr(&server, iface)) {
 		/* bind the socket */
-		if (bind(sock, (struct sockaddr *) &server, sizeof(server)) < 0) {
+		if (bind(sock, (struct sockaddr *) &server,
+				sizeof(server)) < 0) {
 			logwrite(LOG_ALERT, "bind: %s\n", strerror(errno));
 			return -1;
 		}