From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yviqb-0003PV-C1 for qemu-devel@nongnu.org; Fri, 22 May 2015 05:02:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yviqa-0004es-A1 for qemu-devel@nongnu.org; Fri, 22 May 2015 05:02:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yviqa-0004em-5d for qemu-devel@nongnu.org; Fri, 22 May 2015 05:02:28 -0400 From: Stefan Hajnoczi Date: Fri, 22 May 2015 10:01:39 +0100 Message-Id: <1432285330-13994-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1432285330-13994-1-git-send-email-stefanha@redhat.com> References: <1432285330-13994-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 07/38] block/parallels: replace magic constants 4, 64 with proper sizeofs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Roman Kagan , Stefan Hajnoczi , "Denis V. Lunev" From: "Denis V. Lunev" simple purification.. Signed-off-by: Denis V. Lunev Reviewed-by: Roman Kagan Reviewed-by: Stefan Hajnoczi Signed-off-by: Roman Kagan Message-id: 1430207220-24458-8-git-send-email-den@openvz.org CC: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- block/parallels.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index f3ffece..138e618 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -32,7 +32,6 @@ #define HEADER_MAGIC "WithoutFreeSpace" #define HEADER_MAGIC2 "WithouFreSpacExt" #define HEADER_VERSION 2 -#define HEADER_SIZE 64 // always little-endian typedef struct ParallelsHeader { @@ -67,7 +66,7 @@ static int parallels_probe(const uint8_t *buf, int buf_size, const char *filenam { const ParallelsHeader *ph = (const void *)buf; - if (buf_size < HEADER_SIZE) + if (buf_size < sizeof(ParallelsHeader)) return 0; if ((!memcmp(ph->magic, HEADER_MAGIC, 16) || @@ -120,7 +119,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } s->catalog_size = le32_to_cpu(ph.catalog_entries); - if (s->catalog_size > INT_MAX / 4) { + if (s->catalog_size > INT_MAX / sizeof(uint32_t)) { error_setg(errp, "Catalog too large"); ret = -EFBIG; goto fail; @@ -131,7 +130,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret = bdrv_pread(bs->file, 64, s->catalog_bitmap, s->catalog_size * 4); + ret = bdrv_pread(bs->file, sizeof(ParallelsHeader), + s->catalog_bitmap, s->catalog_size * sizeof(uint32_t)); if (ret < 0) { goto fail; } -- 2.1.0