BaseTools/DevicePath: fix GCC build error in print_mem(), and clean it up
authorLaszlo Ersek <lersek@redhat.com>
Tue, 2 Jan 2018 17:16:36 +0000 (01:16 +0800)
committerYonghong Zhu <yonghong.zhu@intel.com>
Wed, 3 Jan 2018 08:34:11 +0000 (16:34 +0800)
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<n; 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 <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Fixes: 7dbc50bd244d95fdc1741b9cfc561f0bfd724de1
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
BaseTools/Source/C/DevicePath/DevicePath.c

index 4c87163209ab11a2d5a3526f671b350c488797a2..76b8553b7145296b886176151eedf66fc8a93fb9 100644 (file)
@@ -103,11 +103,19 @@ Returns:
 }\r
 \r
 \r
 }\r
 \r
 \r
-void print_mem(void const *vp, size_t n)\r
+STATIC\r
+VOID\r
+PrintMem (\r
+  CONST VOID *Buffer,\r
+  UINTN      Count\r
+  )\r
 {\r
 {\r
-    unsigned char const *p = vp;\r
-    for (size_t i=0; i<n; i++) {\r
-        printf("0x%02x ", p[i]);\r
+  CONST UINT8 *Bytes;\r
+  UINTN       Idx;\r
+\r
+  Bytes = Buffer;\r
+  for (Idx = 0; Idx < Count; Idx++) {\r
+    printf("0x%02x ", Bytes[Idx]);\r
   }\r
 }\r
 \r
   }\r
 }\r
 \r
@@ -177,10 +185,10 @@ int main(int argc, CHAR8 *argv[])
   DevicePath = UefiDevicePathLibConvertTextToDevicePath(Str16);\r
   while (!((DevicePath->Type == END_DEVICE_PATH_TYPE) && (DevicePath->SubType == END_ENTIRE_DEVICE_PATH_SUBTYPE)) )\r
   {\r
   DevicePath = UefiDevicePathLibConvertTextToDevicePath(Str16);\r
   while (!((DevicePath->Type == END_DEVICE_PATH_TYPE) && (DevicePath->SubType == END_ENTIRE_DEVICE_PATH_SUBTYPE)) )\r
   {\r
-    print_mem(DevicePath, (DevicePath->Length[0] | DevicePath->Length[1] << 8));\r
+    PrintMem (DevicePath, DevicePath->Length[0] | DevicePath->Length[1] << 8);\r
     DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)DevicePath + (DevicePath->Length[0] | DevicePath->Length[1] << 8));\r
   }\r
     DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)DevicePath + (DevicePath->Length[0] | DevicePath->Length[1] << 8));\r
   }\r
-  print_mem(DevicePath, (DevicePath->Length[0] | DevicePath->Length[1] << 8));\r
+  PrintMem (DevicePath, DevicePath->Length[0] | DevicePath->Length[1] << 8);\r
   putchar('\n');\r
   return STATUS_SUCCESS;\r
 }\r
   putchar('\n');\r
   return STATUS_SUCCESS;\r
 }\r