X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fnfsmount.c;h=cd722acc34f2c6eb895e429edc642dca45b3f84c;hb=081df62b921cf17f1d4c4e0214abfa273c92cfde;hp=aee496980dafa808fa0aea422ee1c91569bddb7f;hpb=cbe31dace5fb24304694d399b9eb267fbe752516;p=oweals%2Fbusybox.git

diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index aee496980..cd722acc3 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -157,7 +157,7 @@ static const int NFS_MOUNT_NONLM = 0x0200;	/* 3 */
 #define HAVE_personality
 #define HAVE_tm_gmtoff
 
-static char *nfs_strerror(int stat);
+static char *nfs_strerror(int status);
 
 #define MAKE_VERSION(p,q,r)	(65536*(p) + 256*(q) + (r))
 #define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
@@ -262,7 +262,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	char hostdir[1024];
 	CLIENT *mclient;
 	char *hostname;
-	char *dirname;
+	char *pathname;
 	char *old_opts;
 	char *mounthost=NULL;
 	char new_opts[1024];
@@ -316,7 +316,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	strcpy(hostdir, spec);
 	if ((s = strchr(hostdir, ':'))) {
 		hostname = hostdir;
-		dirname = s + 1;
+		pathname = s + 1;
 		*s = '\0';
 		/* Ignore all but first hostname in replicated mounts
 		   until they can be fully supported. (mack@sgi.com) */
@@ -335,7 +335,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 #endif
 	{
 		if ((hp = gethostbyname(hostname)) == NULL) {
-			error_msg("can't get address for %s", hostname);
+			herror_msg("%s", hostname);
 			goto fail;
 		} else {
 			if (hp->h_length > sizeof(struct in_addr)) {
@@ -580,7 +580,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	    mount_server_addr.sin_addr.s_addr = inet_addr(hostname);
 	  } else {
 		  if ((hp = gethostbyname(mounthost)) == NULL) {
-			  error_msg("can't get address for %s", hostname);
+			  herror_msg("%s", mounthost);
 			  goto fail;
 		  } else {
 			  if (hp->h_length > sizeof(struct in_addr)) {
@@ -662,7 +662,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 			mclient = 0;
 			}
 			if (mclient) {
-				/* try to mount hostname:dirname */
+				/* try to mount hostname:pathname */
 				mclient->cl_auth = authunix_create_default();
 
 			/* make pointers in xdr_mountres3 NULL so
@@ -673,14 +673,14 @@ int nfsmount(const char *spec, const char *node, int *flags,
 			if (pm_mnt->pm_vers == 3)
 				clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
 						      (xdrproc_t) xdr_dirpath,
-						      (caddr_t) &dirname,
+						      (caddr_t) &pathname,
 						      (xdrproc_t) xdr_mountres3,
 						      (caddr_t) &status,
 					total_timeout);
 			else
 				clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
 						      (xdrproc_t) xdr_dirpath,
-						      (caddr_t) &dirname,
+						      (caddr_t) &pathname,
 						      (xdrproc_t) xdr_fhstatus,
 						      (caddr_t) &status,
 						      total_timeout);
@@ -720,7 +720,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	if (nfsvers == 2) {
 		if (status.nfsv2.fhs_status != 0) {
 			error_msg("%s:%s failed, reason given by server: %s",
-				hostname, dirname,
+				hostname, pathname,
 				nfs_strerror(status.nfsv2.fhs_status));
 			goto fail;
 		}
@@ -735,20 +735,20 @@ int nfsmount(const char *spec, const char *node, int *flags,
 #endif
 	} else {
 #if NFS_MOUNT_VERSION >= 4
-		fhandle3 *fhandle;
+		fhandle3 *my_fhandle;
 		if (status.nfsv3.fhs_status != 0) {
 			error_msg("%s:%s failed, reason given by server: %s",
-				hostname, dirname,
+				hostname, pathname,
 				nfs_strerror(status.nfsv3.fhs_status));
 			goto fail;
 		}
-		fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle;
+		my_fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle;
 		memset(data.old_root.data, 0, NFS_FHSIZE);
 		memset(&data.root, 0, sizeof(data.root));
-		data.root.size = fhandle->fhandle3_len;
+		data.root.size = my_fhandle->fhandle3_len;
 		memcpy(data.root.data,
-		       (char *) fhandle->fhandle3_val,
-		       fhandle->fhandle3_len);
+		       (char *) my_fhandle->fhandle3_val,
+		       my_fhandle->fhandle3_len);
 
 		data.flags |= NFS_MOUNT_VER3;
 #endif
@@ -873,20 +873,20 @@ static struct {
 	{ -1,			EIO		}
 };
 
-static char *nfs_strerror(int stat)
+static char *nfs_strerror(int status)
 {
 	int i;
 	static char buf[256];
 
 	for (i = 0; nfs_errtbl[i].stat != -1; i++) {
-		if (nfs_errtbl[i].stat == stat)
+		if (nfs_errtbl[i].stat == status)
 			return strerror(nfs_errtbl[i].errnum);
 	}
-	sprintf(buf, _("unknown nfs status return value: %d"), stat);
+	sprintf(buf, _("unknown nfs status return value: %d"), status);
 	return buf;
 }
 
-bool_t
+static bool_t
 xdr_fhandle (XDR *xdrs, fhandle objp)
 {
 	//register int32_t *buf;