2010-12-03 20:41:06

by Jim Rees

Subject: [PATCH 2/2] silence compiler warnings

Signed-off-by: Jim Rees <[email protected]>
---
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

2010-12-09 11:03:57

by Benny Halevy

Subject: Re: [PATCH 2/2] silence compiler warnings

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 <[email protected]>
> ---
> 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;