fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 07:08:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add streq() helper to use instead of strcmp() == 0

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-05-26 08:46:05 +10:00
parent c4be027b90
commit 0ca29c6ddc
9 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/evdev.c
View file

@ -1970,7 +1970,7 @@ evdev_device_compare_syspath(struct udev_device *udev_device, int fd)
if (!udev_device_new) if (!udev_device_new)
goto out; goto out;
rc = strcmp(udev_device_get_syspath(udev_device_new), rc = !streq(udev_device_get_syspath(udev_device_new),
udev_device_get_syspath(udev_device)); udev_device_get_syspath(udev_device));
out: out:
if (udev_device_new) if (udev_device_new)

2
src/libinput-util.h
View file

@ -83,6 +83,8 @@ int list_empty(const struct list *list);
#define min(a, b) (((a) < (b)) ? (a) : (b)) #define min(a, b) (((a) < (b)) ? (a) : (b))
#define max(a, b) (((a) > (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b))
#define streq(s1, s2) (strcmp((s1), (s2)) == 0)
#define strneq(s1, s2, n) (strncmp((s1), (s2), (n)) == 0)
#define LIBINPUT_EXPORT __attribute__ ((visibility("default"))) #define LIBINPUT_EXPORT __attribute__ ((visibility("default")))

4
src/path.c
View file

@ -101,8 +101,8 @@ path_seat_get_named(struct path_input *input,
struct path_seat *seat; struct path_seat *seat;
list_for_each(seat, &input->base.seat_list, base.link) { list_for_each(seat, &input->base.seat_list, base.link) {
if (strcmp(seat->base.physical_name, seat_name_physical) == 0 && if (streq(seat->base.physical_name, seat_name_physical) &&
strcmp(seat->base.logical_name, seat_name_logical) == 0) streq(seat->base.logical_name, seat_name_logical))
return seat; return seat;
} }

12
src/udev-seat.c
View file

@ -57,7 +57,7 @@ device_added(struct udev_device *udev_device,
if (!device_seat) if (!device_seat)
device_seat = default_seat; device_seat = default_seat;
if (strcmp(device_seat, input->seat_id)) if (!streq(device_seat, input->seat_id))
return 0; return 0;
devnode = udev_device_get_devnode(udev_device); devnode = udev_device_get_devnode(udev_device);
@ -131,8 +131,8 @@ device_removed(struct udev_device *udev_device, struct udev_input *input)
list_for_each(seat, &input->base.seat_list, base.link) { list_for_each(seat, &input->base.seat_list, base.link) {
list_for_each_safe(device, next, list_for_each_safe(device, next,
&seat->base.devices_list, base.link) { &seat->base.devices_list, base.link) {
if (!strcmp(syspath, if (streq(syspath,
udev_device_get_syspath(device->udev_device))) { udev_device_get_syspath(device->udev_device))) {
log_info(&input->base, log_info(&input->base,
"input device %s, %s removed\n", "input device %s, %s removed\n",
device->devname, device->devname,
@ -198,9 +198,9 @@ evdev_udev_handler(void *data)
if (strncmp("event", udev_device_get_sysname(udev_device), 5) != 0) if (strncmp("event", udev_device_get_sysname(udev_device), 5) != 0)
goto out; goto out;
if (!strcmp(action, "add")) if (streq(action, "add"))
device_added(udev_device, input, NULL); device_added(udev_device, input, NULL);
else if (!strcmp(action, "remove")) else if (streq(action, "remove"))
device_removed(udev_device, input); device_removed(udev_device, input);
out: out:
@ -328,7 +328,7 @@ udev_seat_get_named(struct udev_input *input, const char *seat_name)
struct udev_seat *seat; struct udev_seat *seat;
list_for_each(seat, &input->base.seat_list, base.link) { list_for_each(seat, &input->base.seat_list, base.link) {
if (strcmp(seat->base.logical_name, seat_name) == 0) if (streq(seat->base.logical_name, seat_name))
return seat; return seat;
} }

6
test/litest.c
View file

@ -432,7 +432,7 @@ litest_add_tcase_for_device(struct suite *suite,
const char *test_name = dev->shortname; const char *test_name = dev->shortname;
list_for_each(t, &suite->tests, node) { list_for_each(t, &suite->tests, node) {
if (strcmp(t->name, test_name) != 0) if (!streq(t->name, test_name))
continue; continue;
if (range) if (range)
@ -476,7 +476,7 @@ litest_add_tcase_no_device(struct suite *suite,
return; return;
list_for_each(t, &suite->tests, node) { list_for_each(t, &suite->tests, node) {
if (strcmp(t->name, test_name) != 0) if (!streq(t->name, test_name))
continue; continue;
if (range) if (range)
@ -504,7 +504,7 @@ get_suite(const char *name)
list_init(&all_tests); list_init(&all_tests);
list_for_each(s, &all_tests, node) { list_for_each(s, &all_tests, node) {
if (strcmp(s->name, name) == 0) if (streq(s->name, name))
return s; return s;
} }

3
test/udev.c
View file

@ -26,6 +26,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <libinput.h> #include <libinput.h>
#include <libinput-util.h>
#include <libudev.h> #include <libudev.h>
#include <unistd.h> #include <unistd.h>
@ -184,7 +185,7 @@ START_TEST(udev_added_seat_default)
ck_assert(seat != NULL); ck_assert(seat != NULL);
seat_name = libinput_seat_get_logical_name(seat); seat_name = libinput_seat_get_logical_name(seat);
default_seat_found = !strcmp(seat_name, "default"); default_seat_found = streq(seat_name, "default");
libinput_event_destroy(event); libinput_event_destroy(event);
} }

5
tools/libinput-list-devices.c
View file

@ -30,6 +30,7 @@
#include <libudev.h> #include <libudev.h>
#include <libinput.h> #include <libinput.h>
#include <libinput-util.h>
#include <libinput-version.h> #include <libinput-version.h>
#include "shared.h" #include "shared.h"
@ -279,10 +280,10 @@ main(int argc, char **argv)
struct libinput_event *ev; struct libinput_event *ev;
if (argc > 1) { if (argc > 1) {
if (strcmp(argv[1], "--help") == 0) { if (streq(argv[1], "--help")) {
usage(); usage();
return 0; return 0;
} else if (strcmp(argv[1], "--version") == 0) { } else if (streq(argv[1], "--version")) {
printf("%s\n", LIBINPUT_VERSION); printf("%s\n", LIBINPUT_VERSION);
return 0; return 0;
} else { } else {

8
tools/ptraccel-debug.c
View file

@ -220,13 +220,13 @@ main(int argc, char **argv)
switch (c) { switch (c) {
case OPT_MODE: case OPT_MODE:
if (strcmp(optarg, "accel") == 0) if (streq(optarg, "accel"))
print_accel = true; print_accel = true;
else if (strcmp(optarg, "motion") == 0) else if (streq(optarg, "motion"))
print_motion = true; print_motion = true;
else if (strcmp(optarg, "delta") == 0) else if (streq(optarg, "delta"))
print_delta = true; print_delta = true;
else if (strcmp(optarg, "sequence") == 0) else if (streq(optarg, "sequence"))
print_sequence = true; print_sequence = true;
else { else {
usage(); usage();

15
tools/shared.c
View file

@ -31,6 +31,7 @@
#include <libudev.h> #include <libudev.h>
#include <libevdev/libevdev.h> #include <libevdev/libevdev.h>
#include <libinput-util.h>
#include "shared.h" #include "shared.h"
@ -189,13 +190,13 @@ tools_parse_args(int argc, char **argv, struct tools_options *options)
tools_usage(); tools_usage();
return 1; return 1;
} }
if (strcmp(optarg, "none") == 0) { if (streq(optarg, "none")) {
options->click_method = options->click_method =
LIBINPUT_CONFIG_CLICK_METHOD_NONE; LIBINPUT_CONFIG_CLICK_METHOD_NONE;
} else if (strcmp(optarg, "clickfinger") == 0) { } else if (streq(optarg, "clickfinger")) {
options->click_method = options->click_method =
LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
} else if (strcmp(optarg, "buttonareas") == 0) { } else if (streq(optarg, "buttonareas")) {
options->click_method = options->click_method =
LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS; LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
} else { } else {
@ -208,16 +209,16 @@ tools_parse_args(int argc, char **argv, struct tools_options *options)
tools_usage(); tools_usage();
return 1; return 1;
} }
if (strcmp(optarg, "none") == 0) { if (streq(optarg, "none")) {
options->scroll_method = options->scroll_method =
LIBINPUT_CONFIG_SCROLL_NO_SCROLL; LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
} else if (strcmp(optarg, "twofinger") == 0) { } else if (streq(optarg, "twofinger")) {
options->scroll_method = options->scroll_method =
LIBINPUT_CONFIG_SCROLL_2FG; LIBINPUT_CONFIG_SCROLL_2FG;
} else if (strcmp(optarg, "edge") == 0) { } else if (streq(optarg, "edge")) {
options->scroll_method = options->scroll_method =
LIBINPUT_CONFIG_SCROLL_EDGE; LIBINPUT_CONFIG_SCROLL_EDGE;
} else if (strcmp(optarg, "button") == 0) { } else if (streq(optarg, "button")) {
options->scroll_method = options->scroll_method =
LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
} else { } else {