| From 6ddebaea406a462feec3ce5a3c04a19223ffc218 Mon Sep 17 00:00:00 2001 |
| Message-Id: <6ddebaea406a462feec3ce5a3c04a19223ffc218.1418766606.git.jen@redhat.com> |
| In-Reply-To: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com> |
| References: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com> |
| From: Fam Zheng <famz@redhat.com> |
| Date: Thu, 4 Dec 2014 00:05:11 -0600 |
| Subject: [CHANGE 17/31] vmdk: Fix "%x" to PRIx32 in format strings for cid |
| To: rhvirt-patches@redhat.com, |
| jen@redhat.com |
| |
| RH-Author: Fam Zheng <famz@redhat.com> |
| Message-id: <1417651524-18041-18-git-send-email-famz@redhat.com> |
| Patchwork-id: 62690 |
| O-Subject: [RHEL-7.1 qemu-kvm PATCH v5 17/30] vmdk: Fix "%x" to PRIx32 in format strings for cid |
| Bugzilla: 1134251 |
| RH-Acked-by: Jeffrey Cody <jcody@redhat.com> |
| RH-Acked-by: Markus Armbruster <armbru@redhat.com> |
| RH-Acked-by: Max Reitz <mreitz@redhat.com> |
| |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| (cherry picked from commit 9b17031ac4efcf7a587f0e4eea82287a5329b6e7) |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| Signed-off-by: Jeff E. Nelson <jen@redhat.com> |
| |
| block/vmdk.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/block/vmdk.c b/block/vmdk.c |
| index 0a01a2b..4cd2795 100644 |
| |
| |
| @@ -262,7 +262,7 @@ static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent) |
| p_name = strstr(desc, cid_str); |
| if (p_name != NULL) { |
| p_name += cid_str_size; |
| - sscanf(p_name, "%x", &cid); |
| + sscanf(p_name, "%" SCNx32, &cid); |
| } |
| |
| return cid; |
| @@ -290,7 +290,7 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid) |
| p_name = strstr(desc, "CID"); |
| if (p_name != NULL) { |
| p_name += sizeof("CID"); |
| - snprintf(p_name, sizeof(desc) - (p_name - desc), "%x\n", cid); |
| + snprintf(p_name, sizeof(desc) - (p_name - desc), "%" PRIx32 "\n", cid); |
| pstrcat(desc, sizeof(desc), tmp_desc); |
| } |
| |
| @@ -1705,8 +1705,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options, |
| const char desc_template[] = |
| "# Disk DescriptorFile\n" |
| "version=1\n" |
| - "CID=%x\n" |
| - "parentCID=%x\n" |
| + "CID=%" PRIx32 "\n" |
| + "parentCID=%" PRIx32 "\n" |
| "createType=\"%s\"\n" |
| "%s" |
| "\n" |
| @@ -1848,7 +1848,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options, |
| } |
| /* generate descriptor file */ |
| desc = g_strdup_printf(desc_template, |
| - (unsigned int)time(NULL), |
| + (uint32_t)time(NULL), |
| parent_cid, |
| fmt, |
| parent_desc_line, |
| -- |
| 2.1.0 |
| |