summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-01-05 10:02:06 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-01-05 10:07:14 +1000
commitaaaa2df75f3450d867edef6923835d36f6bd18fc (patch)
treea681558004ac854b9e0fb02b2d83042958bef15c
parente4592ad608343d99f47fc43d22db13e07b6b40be (diff)
Move event time printing out to deduplicate.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--evtest.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/evtest.c b/evtest.c
index 05b014b..410efbc 100644
--- a/evtest.c
+++ b/evtest.c
@@ -446,26 +446,27 @@ int main (int argc, char **argv)
return 1;
}
- for (i = 0; i < rd / sizeof(struct input_event); i++)
+ for (i = 0; i < rd / sizeof(struct input_event); i++) {
+ printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
if (ev[i].type == EV_SYN) {
- printf("Event: time %ld.%06ld, -------------- %s ------------\n",
- ev[i].time.tv_sec, ev[i].time.tv_usec, syns[ev[i].code]);
+ printf("-------------- %s ------------\n", syns[ev[i].code]);
} else if (ev[i].type == EV_MSC && (ev[i].code == MSC_RAW || ev[i].code == MSC_SCAN)) {
- printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %02x\n",
- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type,
+ printf("type %d (%s), code %d (%s), value %02x\n",
+ ev[i].type,
events[ev[i].type] ? events[ev[i].type] : "?",
ev[i].code,
names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
ev[i].value);
} else {
- printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n",
- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type,
+ printf("type %d (%s), code %d (%s), value %d\n",
+ ev[i].type,
events[ev[i].type] ? events[ev[i].type] : "?",
ev[i].code,
names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
ev[i].value);
}
+ }
}
}