linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] silence compiler warnings
@ 2010-12-03 20:41 Jim Rees
  2010-12-09 11:03 ` Benny Halevy
  0 siblings, 1 reply; 2+ messages in thread
From: Jim Rees @ 2010-12-03 20:41 UTC (permalink / raw)
  To: Benny Halevy; +Cc: linux-nfs, peter honeyman

Signed-off-by: Jim Rees <rees@umich.edu>
---
 utils/blkmapd/device-process.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c
index 0d8705f..91b0afc 100644
--- a/utils/blkmapd/device-process.c
+++ b/utils/blkmapd/device-process.c
@@ -53,14 +53,13 @@ static char *pretty_sig(char *sig, uint32_t siglen)
 {
 	static char rs[100];
 	uint64_t sigval;
+	unsigned int i;
 
 	if (siglen <= sizeof(sigval)) {
-		int i;
-
 		sigval = 0;
 		for (i = 0; i < siglen; i++)
 			sigval |= ((unsigned char *)sig)[i] << (i * 8);
-		sprintf(rs, "0x%0llx", sigval);
+		sprintf(rs, "0x%0llx", (unsigned long long) sigval);
 	} else {
 		if (siglen > sizeof rs - 4) {
 			siglen = sizeof rs - 4;
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2/2] silence compiler warnings
  2010-12-03 20:41 [PATCH 2/2] silence compiler warnings Jim Rees
@ 2010-12-09 11:03 ` Benny Halevy
  0 siblings, 0 replies; 2+ messages in thread
From: Benny Halevy @ 2010-12-09 11:03 UTC (permalink / raw)
  To: Jim Rees; +Cc: linux-nfs, peter honeyman

Merged both at pnfs-nfs-utils-1-2-4-rc3-2010-12-03

Thanks!

Benny

On 2010-12-03 22:41, Jim Rees wrote:
> Signed-off-by: Jim Rees <rees@umich.edu>
> ---
>  utils/blkmapd/device-process.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c
> index 0d8705f..91b0afc 100644
> --- a/utils/blkmapd/device-process.c
> +++ b/utils/blkmapd/device-process.c
> @@ -53,14 +53,13 @@ static char *pretty_sig(char *sig, uint32_t siglen)
>  {
>  	static char rs[100];
>  	uint64_t sigval;
> +	unsigned int i;
>  
>  	if (siglen <= sizeof(sigval)) {
> -		int i;
> -
>  		sigval = 0;
>  		for (i = 0; i < siglen; i++)
>  			sigval |= ((unsigned char *)sig)[i] << (i * 8);
> -		sprintf(rs, "0x%0llx", sigval);
> +		sprintf(rs, "0x%0llx", (unsigned long long) sigval);
>  	} else {
>  		if (siglen > sizeof rs - 4) {
>  			siglen = sizeof rs - 4;

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-12-09 11:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-03 20:41 [PATCH 2/2] silence compiler warnings Jim Rees
2010-12-09 11:03 ` Benny Halevy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).