From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDdfn-0006Ej-Ed for qemu-devel@nongnu.org; Tue, 20 Jan 2015 13:37:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDdfi-00041z-41 for qemu-devel@nongnu.org; Tue, 20 Jan 2015 13:37:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDdfh-00041n-Rt for qemu-devel@nongnu.org; Tue, 20 Jan 2015 13:37:02 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0KIb1hM009234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 20 Jan 2015 13:37:01 -0500 Message-ID: <54BEA04C.9070304@redhat.com> Date: Tue, 20 Jan 2015 13:37:00 -0500 From: John Snow MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/6] block: vmdk - make ret variable usage clear List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody , qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, stefanha@redhat.com On 01/20/2015 12:31 PM, Jeff Cody wrote: > Keep the variable 'ret' something that is returned by the function it is > defined in. For the return value of 'sscanf', use a more meaningful > variable name. > > Signed-off-by: Jeff Cody > --- > block/vmdk.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 52cb888..dc6459c 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -785,6 +785,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, > const char *desc_file_path, Error **errp) > { > int ret; > + int matches; > char access[11]; > char type[11]; > char fname[512]; > @@ -796,6 +797,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, > BDRVVmdkState *s = bs->opaque; > VmdkExtent *extent; > > + Stray newline. > while (*p) { > /* parse extent line in one of below formats: > * > @@ -805,23 +807,23 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, > * RW [size in sectors] VMFSSPARSE "file-name.vmdk" > */ > flat_offset = -1; > - ret = sscanf(p, "%10s %" SCNd64 " %10s \"%511[^\n\r\"]\" %" SCNd64, > - access, §ors, type, fname, &flat_offset); > - if (ret < 4 || strcmp(access, "RW")) { > + matches = sscanf(p, "%10s %" SCNd64 " %10s \"%511[^\n\r\"]\" %" SCNd64, > + access, §ors, type, fname, &flat_offset); > + if (matches < 4 || strcmp(access, "RW")) { > goto next_line; > } else if (!strcmp(type, "FLAT")) { > - if (ret != 5 || flat_offset < 0) { > + if (matches != 5 || flat_offset < 0) { > error_setg(errp, "Invalid extent lines: \n%s", p); > return -EINVAL; > } > } else if (!strcmp(type, "VMFS")) { > - if (ret == 4) { > + if (matches == 4) { > flat_offset = 0; > } else { > error_setg(errp, "Invalid extent lines:\n%s", p); > return -EINVAL; > } > - } else if (ret != 4) { > + } else if (matches != 4) { > error_setg(errp, "Invalid extent lines:\n%s", p); > return -EINVAL; > } > Reviewed-by: John Snow