From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 23 Aug 2013 00:20:50 +0000 (+1000)
Subject: Use libevdev_get_event_type_max from libevdev_get_event_code_name
X-Git-Tag: libevdev-0.4~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa4cadae60e41923e81107e06fb1814edace36bd;p=platform%2Fupstream%2Flibevdev.git

Use libevdev_get_event_type_max from libevdev_get_event_code_name

This will check for invalid types for us, and we can do a better check
for signed/unsigned comparison.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index c316e34..fbfd8f0 100644
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -1190,10 +1190,9 @@ libevdev_get_event_type_name(unsigned int type)
 const char*
 libevdev_get_event_code_name(unsigned int type, unsigned int code)
 {
-	if (type > EV_MAX)
-		return NULL;
+	int max = libevdev_get_event_type_max(type);
 
-	if (code > ev_max[type])
+	if (max == -1 || code > (unsigned int)max)
 		return NULL;
 
 	return event_type_map[type][code];