From c00c5cb6914b8674115fa591bf5c0351ead7161f Mon Sep 17 00:00:00 2001 From: weizhixiang <1138871845@qq.com> Date: Sun, 7 Mar 2021 14:39:56 +0800 Subject: [PATCH] replace strncmp with strneq for safety-check Signed-off-by: weizhixiang --- src/udev-seat.c | 4 ++-- test/test-path.c | 2 +- test/test-udev.c | 2 +- tools/shared.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/udev-seat.c b/src/udev-seat.c index 0a7aeec7..7fc1dcef 100644 --- a/src/udev-seat.c +++ b/src/udev-seat.c @@ -184,7 +184,7 @@ udev_input_add_devices(struct udev_input *input, struct udev *udev) continue; sysname = udev_device_get_sysname(device); - if (strncmp("event", sysname, 5) != 0) { + if (!strneq("event", sysname, 5)) { udev_device_unref(device); continue; } @@ -228,7 +228,7 @@ evdev_udev_handler(void *data) if (!action) goto out; - if (strncmp("event", udev_device_get_sysname(udev_device), 5) != 0) + if (!strneq("event", udev_device_get_sysname(udev_device), 5)) goto out; if (streq(action, "add")) diff --git a/test/test-path.c b/test/test-path.c index 43e75f25..871bc623 100644 --- a/test/test-path.c +++ b/test/test-path.c @@ -494,7 +494,7 @@ START_TEST(path_device_sysname) ck_assert_notnull(sysname); ck_assert_int_gt(strlen(sysname), 1); ck_assert(strchr(sysname, '/') == NULL); - ck_assert_int_eq(strncmp(sysname, "event", 5), 0); + ck_assert(strneq(sysname, "event", 5)); libinput_event_destroy(ev); } diff --git a/test/test-udev.c b/test/test-udev.c index ad86d14b..ead332df 100644 --- a/test/test-udev.c +++ b/test/test-udev.c @@ -489,7 +489,7 @@ START_TEST(udev_device_sysname) ck_assert_notnull(sysname); ck_assert_int_gt(strlen(sysname), 1); ck_assert(strchr(sysname, '/') == NULL); - ck_assert_int_eq(strncmp(sysname, "event", 5), 0); + ck_assert(strneq(sysname, "event", 5)); libinput_event_destroy(ev); } diff --git a/tools/shared.c b/tools/shared.c index 8ba5f6a8..65c1c7ce 100644 --- a/tools/shared.c +++ b/tools/shared.c @@ -485,7 +485,7 @@ find_device(const char *udev_tag) continue; sysname = udev_device_get_sysname(device); - if (strncmp("event", sysname, 5) != 0) { + if (!strneq("event", sysname, 5)) { udev_device_unref(device); continue; }