[PATCH 2/3] [klibc] nfsmount: s/PF_INET/AF_INET/

maximilian attems max at stro.at
Tue Feb 23 06:00:06 PST 2010


use AF_INET directly.

Signed-off-by: maximilian attems <max at stro.at>
---
 usr/kinit/nfsmount/dummypmap.c |    2 +-
 usr/kinit/nfsmount/mount.c     |    4 ++--
 usr/kinit/nfsmount/sunrpc.c    |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/kinit/nfsmount/dummypmap.c b/usr/kinit/nfsmount/dummypmap.c
index 43abe37..481e23b 100644
--- a/usr/kinit/nfsmount/dummypmap.c
+++ b/usr/kinit/nfsmount/dummypmap.c
@@ -39,7 +39,7 @@ struct portmap_reply {
 
 static int bind_portmap(void)
 {
-	int sock = socket(PF_INET, SOCK_DGRAM, 0);
+	int sock = socket(AF_INET, SOCK_DGRAM, 0);
 	struct sockaddr_in sin;
 
 	if (sock < 0)
diff --git a/usr/kinit/nfsmount/mount.c b/usr/kinit/nfsmount/mount.c
index a55af91..f18cffa 100644
--- a/usr/kinit/nfsmount/mount.c
+++ b/usr/kinit/nfsmount/mount.c
@@ -290,9 +290,9 @@ int nfs_mount(const char *pathname, const char *hostname,
 	mounted = 1;
 
 	if (data->flags & NFS_MOUNT_TCP) {
-		sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+		sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	} else {
-		sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+		sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	}
 
 	if (sock == -1) {
diff --git a/usr/kinit/nfsmount/sunrpc.c b/usr/kinit/nfsmount/sunrpc.c
index 6607cf7..6fb81a1 100644
--- a/usr/kinit/nfsmount/sunrpc.c
+++ b/usr/kinit/nfsmount/sunrpc.c
@@ -152,7 +152,7 @@ struct client *tcp_client(uint32_t server, uint16_t port, uint32_t flags)
 
 	memset(clnt, 0, sizeof(clnt));
 
-	if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+	if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
 		perror("socket");
 		goto bail;
 	}
@@ -197,7 +197,7 @@ struct client *udp_client(uint32_t server, uint16_t port, uint32_t flags)
 
 	memset(clnt, 0, sizeof(clnt));
 
-	if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
+	if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
 		perror("socket");
 		goto bail;
 	}
-- 
1.6.6.1


--r5Pyd7+fXNt84Ff3
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0003-klibc-Add-relevant-socket.h-definitions.patch"



More information about the klibc mailing list