evdev: fix formatting of struct input_keymap_entry.scancode

* evdev.c (keycode_V2_ioctl): Use PRINT_FIELD_X_ARRAY.
* tests/ioctl_evdev.c (main): Update expected output.

2 files changed, 3 insertions, 10 deletions

diff --git a/evdev.c b/evdev.c
index 573f18f4b..64b673139 100644
--- a/evdev.c
+++ b/evdev.c
@@ -14,6 +14,7 @@
 
 #ifdef HAVE_LINUX_INPUT_H
 
+# include "print_fields.h"
 # include <linux/ioctl.h>
 # include "types/evdev.h"
 
@@ -135,17 +136,9 @@ keycode_V2_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 		ike.len);
 
 	if (!abbrev(tcp)) {
-		unsigned int i;
-
 		tprintf("index=%" PRIu16 ", keycode=", ike.index);
 		printxval(evdev_keycode, ike.keycode, "KEY_???");
-		tprints(", scancode=[");
-		for (i = 0; i < ARRAY_SIZE(ike.scancode); i++) {
-			if (i > 0)
-				tprints(", ");
-			tprintf("%" PRIx8, ike.scancode[i]);
-		}
-		tprints("]");
+		PRINT_FIELD_X_ARRAY(", ", ike, scancode);
 	} else {
 		tprints("...");
 	}
diff --git a/tests/ioctl_evdev.c b/tests/ioctl_evdev.c
index 4c9bba306..df62fbbd3 100644
--- a/tests/ioctl_evdev.c
+++ b/tests/ioctl_evdev.c
@@ -223,7 +223,7 @@ main(void)
 	for (i = 0; i < ARRAY_SIZE(ike->scancode); ++i) {
 		if (i > 0)
 			printf(", ");
-		printf("%" PRIx8, ike->scancode[i]);
+		printf("%#" PRIx8, ike->scancode[i]);
 	}
 	printf("]");
 #  else