From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9981921CB2E3D for ; Wed, 3 Jan 2018 06:51:59 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 150E080F79; Wed, 3 Jan 2018 14:57:02 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-123-216.rdu2.redhat.com [10.10.123.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB0AE6A84C; Wed, 3 Jan 2018 14:57:00 +0000 (UTC) To: "Zhu, Yonghong" , 'edk2-devel-01' Cc: "Gao, Liming" References: <20180102171636.29351-1-lersek@redhat.com> From: Laszlo Ersek Message-ID: <747f08d4-220a-47bc-33fb-e0e553c3ea19@redhat.com> Date: Wed, 3 Jan 2018 15:56:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 03 Jan 2018 14:57:02 +0000 (UTC) Subject: Re: [PATCH] BaseTools/DevicePath: fix GCC build error in print_mem(), and clean it up X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jan 2018 14:52:00 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 01/03/18 09:37, Zhu, Yonghong wrote: > I pushed this fix first since it blocked some GCC tool chain. > > SHA-1: 9a6b445bc2e6e2db6f67ab3cc425d5831aa1b7c8 > > Best Regards, > Zhu Yonghong Thank you! Laszlo > > > -----Original Message----- > From: Zhu, Yonghong > Sent: Wednesday, January 3, 2018 9:27 AM > To: Laszlo Ersek ; edk2-devel-01 > Cc: Gao, Liming ; Zhu, Yonghong > Subject: RE: [PATCH] BaseTools/DevicePath: fix GCC build error in print_mem(), and clean it up > > Thanks. > > Reviewed-by: Yonghong Zhu > > Best Regards, > Zhu Yonghong > > > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Wednesday, January 03, 2018 1:17 AM > To: edk2-devel-01 > Cc: Gao, Liming ; Zhu, Yonghong > Subject: [PATCH] BaseTools/DevicePath: fix GCC build error in print_mem(), and clean it up > > Currently "BaseTools/Source/C/DevicePath/DevicePath.c" fails to build with > GCC48: > >> DevicePath.c: In function 'print_mem': >> DevicePath.c:109:5: error: 'for' loop initial declarations are only >> allowed in C99 mode >> for (size_t i=0; i> ^ >> DevicePath.c:109:5: note: use option -std=c99 or -std=gnu99 to compile >> your code > > In addition, the print_mem() function does not conform to the edk2 coding > style: > > - we use CamelCase and no underscores in identifiers, > - the types and type qualifiers should follow the edk2 style, > - initialization as part of definition is forbidden for local variables. > > Clean these up. > > While updating the print_mem()/PrintMem() call sites, also remove the superfluous parentheses around the second argument. > > Cc: Liming Gao > Cc: Yonghong Zhu > Fixes: 7dbc50bd244d95fdc1741b9cfc561f0bfd724de1 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Laszlo Ersek > --- > > Notes: > Build-tested only (I don't have a DSC file with a device path PCD). > > BaseTools/Source/C/DevicePath/DevicePath.c | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/BaseTools/Source/C/DevicePath/DevicePath.c b/BaseTools/Source/C/DevicePath/DevicePath.c > index 4c87163209ab..76b8553b7145 100644 > --- a/BaseTools/Source/C/DevicePath/DevicePath.c > +++ b/BaseTools/Source/C/DevicePath/DevicePath.c > @@ -103,11 +103,19 @@ Returns: > } > > > -void print_mem(void const *vp, size_t n) > +STATIC > +VOID > +PrintMem ( > + CONST VOID *Buffer, > + UINTN Count > + ) > { > - unsigned char const *p = vp; > - for (size_t i=0; i - printf("0x%02x ", p[i]); > + CONST UINT8 *Bytes; > + UINTN Idx; > + > + Bytes = Buffer; > + for (Idx = 0; Idx < Count; Idx++) { > + printf("0x%02x ", Bytes[Idx]); > } > } > > @@ -177,10 +185,10 @@ int main(int argc, CHAR8 *argv[]) > DevicePath = UefiDevicePathLibConvertTextToDevicePath(Str16); > while (!((DevicePath->Type == END_DEVICE_PATH_TYPE) && (DevicePath->SubType == END_ENTIRE_DEVICE_PATH_SUBTYPE)) ) > { > - print_mem(DevicePath, (DevicePath->Length[0] | DevicePath->Length[1] << 8)); > + PrintMem (DevicePath, DevicePath->Length[0] | DevicePath->Length[1] > + << 8); > DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)DevicePath + (DevicePath->Length[0] | DevicePath->Length[1] << 8)); > } > - print_mem(DevicePath, (DevicePath->Length[0] | DevicePath->Length[1] << 8)); > + PrintMem (DevicePath, DevicePath->Length[0] | DevicePath->Length[1] > + << 8); > putchar('\n'); > return STATUS_SUCCESS; > } > -- > 2.14.1.3.gb7cf6e02401b >