aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-08-22 09:48:17 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-08-23 09:20:24 +1000
commitd29b44ea96fa257068b3a7af96515dd8b89f12de (patch)
tree7b6e10559da4fd56d3a34accbd9a0839ba9553e3
parenta92be3bad6ac60afec5c9945aba749a5dbaf9d16 (diff)
downloadexternal_evtest-d29b44ea96fa257068b3a7af96515dd8b89f12de.tar.gz
external_evtest-d29b44ea96fa257068b3a7af96515dd8b89f12de.tar.bz2
external_evtest-d29b44ea96fa257068b3a7af96515dd8b89f12de.zip
Use temp variables for type/code when printing events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
-rw-r--r--evtest.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/evtest.c b/evtest.c
index 9639c22..139a34e 100644
--- a/evtest.c
+++ b/evtest.c
@@ -839,20 +839,25 @@ static int print_events(int fd)
}
for (i = 0; i < rd / sizeof(struct input_event); i++) {
+ unsigned int type, code;
+
+ type = ev[i].type;
+ code = ev[i].code;
+
printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
- if (ev[i].type == EV_SYN) {
- if (ev[i].code == SYN_MT_REPORT)
- printf("++++++++++++++ %s ++++++++++++\n", syns[ev[i].code]);
+ if (type == EV_SYN) {
+ if (code == SYN_MT_REPORT)
+ printf("++++++++++++++ %s ++++++++++++\n", syns[code]);
else
- printf("-------------- %s ------------\n", syns[ev[i].code]);
+ printf("-------------- %s ------------\n", syns[code]);
} else {
printf("type %d (%s), code %d (%s), ",
- 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] : "?") : "?");
- if (ev[i].type == EV_MSC && (ev[i].code == MSC_RAW || ev[i].code == MSC_SCAN))
+ type,
+ events[type] ? events[type] : "?",
+ code,
+ names[type] ? (names[type][code] ? names[type][code] : "?") : "?");
+ if (type == EV_MSC && (code == MSC_RAW || code == MSC_SCAN))
printf("value %02x\n", ev[i].value);
else
printf("value %d\n", ev[i].value);