vboot: format hex numbers with %#x instead of 0x%x

Also standardize on using hex for printing ASCII key values
across vboot_ui.c and vboot_ui_menu.c.

BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none

Change-Id: Ib10288d95e29c248ebe807d99108aea75775b155
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1840191
Reviewed-by: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

4 files changed, 8 insertions, 8 deletions

diff --git a/utility/chromeos-tpm-recovery-test b/utility/chromeos-tpm-recovery-test
index e633d311..42331e25 100755
--- a/utility/chromeos-tpm-recovery-test
+++ b/utility/chromeos-tpm-recovery-test
@@ -327,7 +327,7 @@ test_wrong_size_hog () {
     space_hog_size=$(( $(tpm-nvsize) - 2 ))
   fi
   echo "hogging $(( $space_hog_size )) bytes" >> log
-  $tpmc definespace 0xcafe $(printf "0x%x" $space_hog_size) 0x1 \
+  $tpmc definespace 0xcafe $(printf "%#x" $space_hog_size) 0x1 \
     || echo "hogging failed!" >> log
   takeownership
 
diff --git a/utility/tlcl_generator.c b/utility/tlcl_generator.c
index e34542b1..99ec4a5e 100644
--- a/utility/tlcl_generator.c
+++ b/utility/tlcl_generator.c
@@ -553,15 +553,15 @@ int OutputBytes_(Command* cmd, Field* fld) {
     cursor = fld->offset;
     switch (fld->size) {
     case 1:
-      printf("0x%x, ", fld->value);
+      printf("%#x, ", fld->value);
       cursor += 1;
       break;
     case 2:
-      printf("0x%x, 0x%x, ", fld->value >> 8, fld->value & 0xff);
+      printf("%#x, %#x, ", fld->value >> 8, fld->value & 0xff);
       cursor += 2;
       break;
     case 4:
-      printf("0x%x, 0x%x, 0x%x, 0x%x, ", fld->value >> 24,
+      printf("%#x, %#x, %#x, %#x, ", fld->value >> 24,
              (fld->value >> 16) & 0xff,
              (fld->value >> 8) & 0xff,
              fld->value & 0xff);
diff --git a/utility/tpm-nvsize b/utility/tpm-nvsize
index 724dcd8b..ec2d0337 100755
--- a/utility/tpm-nvsize
+++ b/utility/tpm-nvsize
@@ -15,7 +15,7 @@ try=$high
 # Binary search with no upper bound
 while true; do
   ## echo trying $try [ $low $high ]
-  if /usr/bin/tpmc definespace 0xf004 $(printf "0x%x" $try) 0x1 \
+  if /usr/bin/tpmc definespace 0xf004 $(printf "%#x" $try) 0x1 \
                                                       > /dev/null 2>&1; then
     # definespace success: end, or $try must grow
     if [ $try -eq $low ]; then
diff --git a/utility/tpmc.c b/utility/tpmc.c
index dc41b03c..5723edff 100644
--- a/utility/tpmc.c
+++ b/utility/tpmc.c
@@ -115,7 +115,7 @@ static uint8_t ErrorCheck(uint32_t result, const char* cmd) {
   } else {
     int i;
     int n = sizeof(tpm_error_table) / sizeof(tpm_error_table[0]);
-    fprintf(stderr, "command \"%s\" failed with code 0x%x\n", cmd, result);
+    fprintf(stderr, "command \"%s\" failed with code %#x\n", cmd, result);
     for (i = 0; i < n; i++) {
       if (tpm_error_table[i].code == result) {
         fprintf(stderr, "%s\n%s\n", tpm_error_table[i].name,
@@ -326,7 +326,7 @@ static uint32_t HandlerRead(void) {
     exit(OTHER_ERROR);
   }
   if (size > sizeof(value)) {
-    fprintf(stderr, "size of read (0x%x) is too big\n", size);
+    fprintf(stderr, "size of read (%#x) is too big\n", size);
     exit(OTHER_ERROR);
   }
   result = TlclRead(index, value, size);
@@ -351,7 +351,7 @@ static uint32_t HandlerGetPermissions(void) {
   }
   result = TlclGetPermissions(index, &permissions);
   if (result == 0) {
-    printf("space 0x%x has permissions 0x%x\n", index, permissions);
+    printf("space %#x has permissions %#x\n", index, permissions);
   }
   return result;
 }