Patchwork qcow2: Use better type for numerical snapshot ID

login
register
mail settings
Submitter Max Reitz
Date Oct. 9, 2013, 12:42 p.m.
Message ID <1381322567-18766-1-git-send-email-mreitz@redhat.com>
Download mbox | patch
Permalink /patch/281887/
State New
Headers show

Comments

Max Reitz - Oct. 9, 2013, 12:42 p.m.
When trying to find a new snapshot ID, the existing ones are converted
to integers using strtoul. This function returns an unsigned long,
therefore its result should be saved in an unsigned long as well.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2-snapshot.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Kevin Wolf - Oct. 9, 2013, 1:21 p.m.
Am 09.10.2013 um 14:42 hat Max Reitz geschrieben:
> When trying to find a new snapshot ID, the existing ones are converted
> to integers using strtoul. This function returns an unsigned long,
> therefore its result should be saved in an unsigned long as well.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 812dab2..5b437ce 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -292,7 +292,8 @@  static void find_new_snapshot_id(BlockDriverState *bs,
 {
     BDRVQcowState *s = bs->opaque;
     QCowSnapshot *sn;
-    int i, id, id_max = 0;
+    int i;
+    unsigned long id, id_max = 0;
 
     for(i = 0; i < s->nb_snapshots; i++) {
         sn = s->snapshots + i;
@@ -300,7 +301,7 @@  static void find_new_snapshot_id(BlockDriverState *bs,
         if (id > id_max)
             id_max = id;
     }
-    snprintf(id_str, id_str_size, "%d", id_max + 1);
+    snprintf(id_str, id_str_size, "%lu", id_max + 1);
 }
 
 static int find_snapshot_by_id_and_name(BlockDriverState *bs,