From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 19:42:27 +0000 (-0700)
Subject: Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~36^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c91169c7c516d9aa38bb34abc4de098f2dc5f454;p=zfs

Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch

Conflicts:
	lib/libzfs/libzfs_util.c
---

c91169c7c516d9aa38bb34abc4de098f2dc5f454
diff --cc lib/libzfs/libzfs_dataset.c
index 07d191dcb,ab9ba6b80..47c6276bc
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@@ -1789,10 -1778,10 +1790,10 @@@ zfs_prop_get(zfs_handle_t *zhp, zfs_pro
  			struct tm t;
  
  			if (literal ||
- 			    localtime_r(&local_time, &t) == NULL ||
+ 			    localtime_r(&time, &t) == NULL ||
  			    strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
  			    &t) == 0)
 -				(void) snprintf(propbuf, proplen, "%llu", val);
 +				(void) snprintf(propbuf, proplen, "%llu", (u_longlong_t) val);
  		}
  		break;
  
diff --cc lib/libzfs/libzfs_util.c
index dfb24b329,4da0fb44b..61966e074
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@@ -531,14 -531,14 +531,14 @@@ zfs_nicenum(uint64_t num, char *buf, si
  
  	while (n >= 1024) {
  		n /= 1024;
- 		i++;
+ 		index++;
  	}
  
- 	u = " KMGTPE"[i];
+ 	u = " KMGTPE"[index];
  
- 	if (i == 0) {
+ 	if (index == 0) {
 -		(void) snprintf(buf, buflen, "%llu", n);
 +		(void) snprintf(buf, buflen, "%llu", (u_longlong_t) n);
- 	} else if ((num & ((1ULL << 10 * i) - 1)) == 0) {
+ 	} else if ((num & ((1ULL << 10 * index) - 1)) == 0) {
  		/*
  		 * If this is an even multiple of the base, always display
  		 * without any decimal precision.