[PATCH weston] libinput-seat: literal values for WESTON_LIBINPUT_LOG_PRIORITY

U. Artie Eoff ullysses.a.eoff at intel.com
Fri May 9 11:24:40 PDT 2014


Only accept specific literal values from the environment variable
WESTON_LIBINPUT_LOG_PRIORITY... "debug", "info", or "error".

Signed-off-by: U. Artie Eoff <ullysses.a.eoff at intel.com>
---
 src/libinput-seat.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libinput-seat.c b/src/libinput-seat.c
index a38d470..d59ae42 100644
--- a/src/libinput-seat.c
+++ b/src/libinput-seat.c
@@ -271,8 +271,15 @@ udev_input_init(struct udev_input *input, struct weston_compositor *c, struct ud
 	libinput_log_set_handler(&libinput_log_func, NULL);
 
 	log_priority = getenv("WESTON_LIBINPUT_LOG_PRIORITY");
+
 	if (log_priority) {
-		libinput_log_set_priority(strtol(log_priority, NULL, 10));
+		if (strcmp(log_priority, "debug") == 0) {
+			libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
+		} else if (strcmp(log_priority, "info") == 0) {
+			libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_INFO);
+		} else if (strcmp(log_priority, "error") == 0) {
+			libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_ERROR);
+		}
 	}
 
 	input->libinput = libinput_udev_create_for_seat(&libinput_interface, input,
-- 
1.9.0



More information about the wayland-devel mailing list