From: Viktor Dukhovni <postfix-users@dukhovni.org>
Date: Fri, 12 Jun 2015 15:29:23 +0000 (-0400)
Subject: Indentation fixup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99680064f7f64f62035ba62a9a347d059f6b5b7f;p=thirdparty%2Fpostfix.git

Indentation fixup
---

diff --git a/postfix/src/smtp/smtp_addr.c b/postfix/src/smtp/smtp_addr.c
index d02b25319..d9de504bd 100644
--- a/postfix/src/smtp/smtp_addr.c
+++ b/postfix/src/smtp/smtp_addr.c
@@ -134,6 +134,7 @@ static DNS_RR *smtp_addr_one(DNS_RR *addr_list, const char *host, int res_opt,
     struct addrinfo *res0;
     struct addrinfo *res;
     INET_PROTO_INFO *proto_info = inet_proto_info();
+    unsigned char *proto_family_list = proto_info->sa_family_list;
     int     found;
 
     if (msg_verbose)
@@ -143,14 +144,14 @@ static DNS_RR *smtp_addr_one(DNS_RR *addr_list, const char *host, int res_opt,
      * Interpret a numerical name as an address.
      */
     if (hostaddr_to_sockaddr(host, (char *) 0, 0, &res0) == 0) {
-	if (strchr((char *) proto_info->sa_family_list, res0->ai_family) != 0) {
-	if ((addr = dns_sa_to_rr(host, pref, res0->ai_addr)) == 0)
-	    msg_fatal("host %s: conversion error for address family %d: %m",
-		    host, ((struct sockaddr *) (res0->ai_addr))->sa_family);
-	addr_list = dns_rr_append(addr_list, addr);
-	freeaddrinfo(res0);
-	return (addr_list);
-    }
+	if (strchr((char *) proto_family_list, res0->ai_family) != 0) {
+	    if ((addr = dns_sa_to_rr(host, pref, res0->ai_addr)) == 0)
+		msg_fatal("host %s: conversion error for address family "
+			  "%d: %m", host, res0->ai_addr->sa_family);
+	    addr_list = dns_rr_append(addr_list, addr);
+	    freeaddrinfo(res0);
+	    return (addr_list);
+	}
 	freeaddrinfo(res0);
     }
 
@@ -214,15 +215,15 @@ static DNS_RR *smtp_addr_one(DNS_RR *addr_list, const char *host, int res_opt,
 		       host, MAI_STRERROR(aierr));
 	} else {
 	    for (found = 0, res = res0; res != 0; res = res->ai_next) {
-		if (strchr((char *) proto_info->sa_family_list, res->ai_family) == 0) {
+		if (strchr((char *) proto_family_list, res->ai_family) == 0) {
 		    msg_info("skipping address family %d for host %s",
 			     res->ai_family, host);
 		    continue;
 		}
 		found++;
 		if ((addr = dns_sa_to_rr(host, pref, res->ai_addr)) == 0)
-		    msg_fatal("host %s: conversion error for address family %d: %m",
-		    host, ((struct sockaddr *) (res0->ai_addr))->sa_family);
+		    msg_fatal("host %s: conversion error for address family "
+			      "%d: %m", host, res0->ai_addr->sa_family);
 		addr_list = dns_rr_append(addr_list, addr);
 	    }
 	    freeaddrinfo(res0);