[PATCH 02/23] mount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG

[PATCH 02/23] mount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG

[Chuck Lever]

After I enabled NFS_MOUNT_DEBUG the compiler started spitting out warnings.
Fix up commas, output formatting, and double-wide character support.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 utils/mount/nfs4mount.c |   19 ++++++++++---------
 utils/mount/nfsmount.c  |   25 ++++++++++++-------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index bd20864..4868c08 100644
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -367,14 +367,14 @@ int nfs4mount(const char *spec, const char *node, int flags,
 	data.host_addrlen = sizeof(server_addr);
 
 #ifdef NFS_MOUNT_DEBUG
-	printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
+	printf(_("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n"),
 	       data.rsize, data.wsize, data.timeo, data.retrans);
-	printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
+	printf(_("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n"),
 	       data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
-	printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
+	printf(_("port = %d, bg = %d, retry = %d, flags = %.8x\n"),
 	       ntohs(server_addr.sin_port), bg, retry, data.flags);
-	printf("soft = %d, intr = %d, nocto = %d, noac = %d, "
-	       "nosharecache = %d\n",
+	printf(_("soft = %d, intr = %d, nocto = %d, noac = %d, "
+	       "nosharecache = %d\n"),
 	       (data.flags & NFS4_MOUNT_SOFT) != 0,
 	       (data.flags & NFS4_MOUNT_INTR) != 0,
 	       (data.flags & NFS4_MOUNT_NOCTO) != 0,
@@ -384,18 +384,19 @@ int nfs4mount(const char *spec, const char *node, int flags,
 	if (num_flavour > 0) {
 		int pf_cnt, i;
 
-		printf("sec = ");
+		printf(_("sec = "));
 		for (pf_cnt = 0; pf_cnt < num_flavour; pf_cnt++) {
 			for (i = 0; i < flav_map_size; i++) {
 				if (flav_map[i].fnum == pseudoflavour[pf_cnt]) {
-					printf("%s", flav_map[i].flavour);
+					printf(_("%s"), flav_map[i].flavour);
 					break;
 				}
 			}
-			printf("%s", (pf_cnt < num_flavour-1) ? ":" : "\n");
+			printf(_("%s"),
+				(pf_cnt < num_flavour - 1) ?  _(":") : _("\n"));
 		}
 	}
-	printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp");
+	printf(_("proto = %s\n"), (data.proto == IPPROTO_TCP) ? _("tcp") : _("udp"));
 #endif
 
 	timeout = time(NULL) + 60 * retry;
diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index ac8d161..a2b95ad 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -582,36 +582,35 @@ nfsmount(const char *spec, const char *node, int flags,
 	
 	if (retry == 10000 && !bg)
 		retry = 2; /* reset for fg mounts */
-	
 
 #ifdef NFS_MOUNT_DEBUG
-	printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
+	printf(_("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n"),
 	       data.rsize, data.wsize, data.timeo, data.retrans);
-	printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
+	printf(_("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n"),
 	       data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
-	printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
+	printf(_("port = %lu, bg = %d, retry = %d, flags = %.8x\n"),
 	       nfs_pmap->pm_port, bg, retry, data.flags);
-	printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n",
+	printf(_("mountprog = %lu, mountvers = %lu, nfsprog = %lu, nfsvers = %lu\n"),
 	       mnt_pmap->pm_prog, mnt_pmap->pm_vers,
 	       nfs_pmap->pm_prog, nfs_pmap->pm_vers);
-	printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d ",
+	printf(_("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d"),
 	       (data.flags & NFS_MOUNT_SOFT) != 0,
 	       (data.flags & NFS_MOUNT_INTR) != 0,
 	       (data.flags & NFS_MOUNT_POSIX) != 0,
 	       (data.flags & NFS_MOUNT_NOCTO) != 0,
 	       (data.flags & NFS_MOUNT_NOAC) != 0);
 #if NFS_MOUNT_VERSION >= 2
-	printf("tcp = %d ",
+	printf(_(", tcp = %d"),
 	       (data.flags & NFS_MOUNT_TCP) != 0);
 #endif
 #if NFS_MOUNT_VERSION >= 4
-	printf("noacl = %d ", (data.flags & NFS_MOUNT_NOACL) != 0);
+	printf(_(", noacl = %d"), (data.flags & NFS_MOUNT_NOACL) != 0);
 #endif
 #if NFS_MOUNT_VERSION >= 5
-	printf("sec = %u ", data.pseudoflavor);
-	printf("readdirplus = %d ", (data.flags & NFS_MOUNT_NORDIRPLUS) != 0);
+	printf(_(", sec = %u"), data.pseudoflavor);
+	printf(_(", readdirplus = %d"), (data.flags & NFS_MOUNT_NORDIRPLUS) != 0);
 #endif
-	printf("\n");
+	printf(_("\n"));
 #endif
 
 	data.version = nfs_mount_data_version;
@@ -760,7 +759,7 @@ nfsmount(const char *spec, const char *node, int flags,
 			if (flavor[i] == data.pseudoflavor)
 				yum = 1;
 #ifdef NFS_MOUNT_DEBUG
-			printf("auth flavor %d: %d\n",
+			printf(_("auth flavor %d: %d\n"),
 				i, flavor[i]);
 #endif
 		}
@@ -803,7 +802,7 @@ noauth_flavors:
 	}
 
 #ifdef NFS_MOUNT_DEBUG
-	printf(_("using port %d for nfs deamon\n"), nfs_pmap->pm_port);
+	printf(_("using port %lu for nfs deamon\n"), nfs_pmap->pm_port);
 #endif
 	nfs_saddr->sin_port = htons(nfs_pmap->pm_port);
 	/*


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

Re: [PATCH 02/23] mount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG

[Steve Dickson]

Chuck Lever wrote:
> After I enabled NFS_MOUNT_DEBUG the compiler started spitting out warnings.
> Fix up commas, output formatting, and double-wide character support.
Aren't these debugging statements basically useless because one has to
recompile to turn them on... Wouldn't it make more sense to add
'-o mntdebug' flag so these could be turned on at will?

steved.


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

Re: [PATCH 02/23] mount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG

[Chuck Lever]

[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]

Steve Dickson wrote:
> Chuck Lever wrote:
>> After I enabled NFS_MOUNT_DEBUG the compiler started spitting out 
>> warnings.
>> Fix up commas, output formatting, and double-wide character support.
> Aren't these debugging statements basically useless because one has to
> recompile to turn them on... Wouldn't it make more sense to add
> '-o mntdebug' flag so these could be turned on at will?

Useless for folks who don't want to or can't compile nfs-utils 
themselves, yes.  But I think the usefulness of these is for anyone who 
is developing mount.  They aren't for debugging problems mounting 
shares, but for debugging changes to mount itself.

I'm not opposed to making these debugging messages available dynamically 
(if we really believe they will be useful for everyday system 
administrators).... but....

Miklos has illuminated an important distinction between mount options 
that affect the behavior of the mounted file system, and mount options 
that control who can mount and how the mount takes place.  NFS is one of 
the worst offenders in mixing the two.

A "mntdebug" option would be of the latter type, and I'm beginning to 
think twice about the value of adding more of these.  I'm thinking about 
a way of specifying those types of options in some other way; for 
example, by using a separate NFS mount policy file like nsswitch.conf to 
set these up.  Just a random thought.

Or, rather, instead of "-o mntdebug" we might consider --mntdebug 
instead; that is, use a command line option instead of a mount option.

It's a nit, I know.

[-- Attachment #2: chuck.lever.vcf --]
[-- Type: text/x-vcard, Size: 290 bytes --]

begin:vcard
fn:Chuck Lever
n:Lever;Chuck
org:Oracle Corporation;Corporate Architecture: Linux Projects Group
adr:;;1015 Granger Avenue;Ann Arbor;MI;48104;USA
title:Principal Member of Staff
tel;work:+1 248 614 5091
x-mozilla-html:FALSE
url:http://oss.oracle.com/~cel
version:2.1
end:vcard


[-- Attachment #3: Type: text/plain, Size: 315 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

[-- Attachment #4: Type: text/plain, Size: 140 bytes --]

_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

Re: [PATCH 02/23] mount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG

[Steve Dickson]

Chuck Lever wrote:
> Steve Dickson wrote:
>> Chuck Lever wrote:
>>> After I enabled NFS_MOUNT_DEBUG the compiler started spitting out 
>>> warnings.
>>> Fix up commas, output formatting, and double-wide character support.
>> Aren't these debugging statements basically useless because one has to
>> recompile to turn them on... Wouldn't it make more sense to add
>> '-o mntdebug' flag so these could be turned on at will?
> 
> Useless for folks who don't want to or can't compile nfs-utils 
> themselves, yes.  But I think the usefulness of these is for anyone who 
> is developing mount.  They aren't for debugging problems mounting 
> shares, but for debugging changes to mount itself.
> 
> I'm not opposed to making these debugging messages available dynamically 
> (if we really believe they will be useful for everyday system 
> administrators).... but....
> 
> Miklos has illuminated an important distinction between mount options 
> that affect the behavior of the mounted file system, and mount options 
> that control who can mount and how the mount takes place.  NFS is one of 
> the worst offenders in mixing the two.
> 
> A "mntdebug" option would be of the latter type, and I'm beginning to 
> think twice about the value of adding more of these.  I'm thinking about 
> a way of specifying those types of options in some other way; for 
> example, by using a separate NFS mount policy file like nsswitch.conf to 
> set these up.  Just a random thought.
> 
> Or, rather, instead of "-o mntdebug" we might consider --mntdebug 
> instead; that is, use a command line option instead of a mount option.
> 
> It's a nit, I know.
Right... a command line option to the actual mount binary is probably
the way to go... The binary could pass a MS_DEBUG flag to the mount.nfs
binary which would enable the debugging...

steved.



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs