Patchwork [v2] block/iscsi.c: Fix printf format error.

login
register
mail settings
Submitter Richard W.M. Jones
Date July 31, 2013, 7:41 p.m.
Message ID <1375299698-16440-1-git-send-email-rjones@redhat.com>
Download mbox | patch
Permalink /patch/263798/
State New
Headers show

Comments

Richard W.M. Jones - July 31, 2013, 7:41 p.m.
From: "Richard W.M. Jones" <rjones@redhat.com>

The error on armv7hl was:

block/iscsi.c: In function ‘is_request_lun_aligned’:
block/iscsi.c:251:26: error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘int64_t’ [-Werror=format=]
                          iscsilun->block_size, sector_num, nb_sectors);
                          ^

This also splits the long line to comply with qemu coding guidelines.

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
 block/iscsi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Andreas Färber - July 31, 2013, 7:59 p.m.
Am 31.07.2013 21:41, schrieb Richard W.M. Jones:
> From: "Richard W.M. Jones" <rjones@redhat.com>
> 
> The error on armv7hl was:
> 
> block/iscsi.c: In function ‘is_request_lun_aligned’:
> block/iscsi.c:251:26: error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘int64_t’ [-Werror=format=]
>                           iscsilun->block_size, sector_num, nb_sectors);
>                           ^
> 
> This also splits the long line to comply with qemu coding guidelines.
> 
> Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
> ---
>  block/iscsi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 5f28c6a..03a1c0a 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -247,7 +247,9 @@ static bool is_request_lun_aligned(int64_t sector_num, int nb_sectors,
>  {
>      if ((sector_num * BDRV_SECTOR_SIZE) % iscsilun->block_size ||
>          (nb_sectors * BDRV_SECTOR_SIZE) % iscsilun->block_size) {
> -            error_report("iSCSI misaligned request: iscsilun->block_size %u, sector_num %ld, nb_sectors %d",
> +            error_report("iSCSI misaligned request: "
> +			 "iscsilun->block_size %u, sector_num %" PRIi64
> +			 ", nb_sectors %d",

Tab-damaged now. ;) scripts/checkpatch.pl complains about both issues -
can be used as commit hook for convenience.

Cheers,
Andreas

>                           iscsilun->block_size, sector_num, nb_sectors);
>              return 0;
>      }
>

Patch

diff --git a/block/iscsi.c b/block/iscsi.c
index 5f28c6a..03a1c0a 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -247,7 +247,9 @@  static bool is_request_lun_aligned(int64_t sector_num, int nb_sectors,
 {
     if ((sector_num * BDRV_SECTOR_SIZE) % iscsilun->block_size ||
         (nb_sectors * BDRV_SECTOR_SIZE) % iscsilun->block_size) {
-            error_report("iSCSI misaligned request: iscsilun->block_size %u, sector_num %ld, nb_sectors %d",
+            error_report("iSCSI misaligned request: "
+			 "iscsilun->block_size %u, sector_num %" PRIi64
+			 ", nb_sectors %d",
                          iscsilun->block_size, sector_num, nb_sectors);
             return 0;
     }