---

yaml --- r: 127442 b: refs/heads/master c: afb0369 h: refs/heads/master v: v3
git-mirror · Jan 6, 2009 · a088019 · a088019
1 parent cb36653
commit a088019
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc995801a09d1fead0bec1356bfd836911c8eed7
+refs/heads/master: afb03699dc0a920aed3322ad0e6895533941fb1e
diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c
@@ -105,6 +105,13 @@ static void nlm_clear_port(struct sockaddr *sap)
 	}
 }
 
+static void nlm_display_ipv4_address(const struct sockaddr *sap, char *buf,
+				     const size_t len)
+{
+	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
+	snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
+}
+
 static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
 				     const size_t len)
 {
@@ -122,11 +129,9 @@ static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
 static void nlm_display_address(const struct sockaddr *sap,
 				char *buf, const size_t len)
 {
-	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
-
 	switch (sap->sa_family) {
 	case AF_INET:
-		snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
+		nlm_display_ipv4_address(sap, buf, len);
 		break;
 	case AF_INET6:
 		nlm_display_ipv6_address(sap, buf, len);