Skip to content

Commit 090be86

Browse files
phomesphomes
committed
use streq instead of strcmp
1 parent b05105f commit 090be86

22 files changed

+66
-66
lines changed

‎src/boot/boot-loader.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ int boot_loader_find_active_entry(struct boot_info *info, const char *loader_act
121121
return -ENOMEM;
122122

123123
for (i = 0; i < info->loader_entries_count; i++) {
124-
if (strcmp(fn, info->loader_entries[i].path) == 0) {
124+
if (streq(fn, info->loader_entries[i].path)) {
125125
info->loader_entry_active = i;
126126
break;
127127
}

‎src/journal/test-journal-syslog.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ static void test_syslog_parse_identifier(const char* str,
3131
ret2 = syslog_parse_identifier(&buf, &ident2, &pid2);
3232

3333
assert(ret == ret2);
34-
assert(ident==ident2 || !strcmp(ident, ident2));
35-
assert(pid==pid2 || !strcmp(pid, pid2));
34+
assert(ident==ident2 || streq(ident, ident2));
35+
assert(pid==pid2 || streq(pid, pid2));
3636
}
3737

3838
int main(void) {

‎src/libudev/libudev-monitor.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
115115

116116
if (name == NULL)
117117
group = UDEV_MONITOR_NONE;
118-
else if (strcmp(name, "udev") == 0)
118+
else if (streq(name, "udev"))
119119
group = UDEV_MONITOR_UDEV;
120-
else if (strcmp(name, "kernel") == 0)
120+
else if (streq(name, "kernel"))
121121
group = UDEV_MONITOR_KERNEL;
122122
else
123123
return NULL;
@@ -467,7 +467,7 @@ static int passes_filter(struct udev_monitor *udev_monitor, struct udev_device *
467467
const char *devtype;
468468
const char *ddevtype;
469469

470-
if (strcmp(dsubsys, subsys) != 0)
470+
if (!streq(dsubsys, subsys))
471471
continue;
472472

473473
devtype = udev_list_entry_get_value(list_entry);
@@ -476,7 +476,7 @@ static int passes_filter(struct udev_monitor *udev_monitor, struct udev_device *
476476
ddevtype = udev_device_get_devtype(udev_device);
477477
if (ddevtype == NULL)
478478
continue;
479-
if (strcmp(ddevtype, devtype) == 0)
479+
if (streq(ddevtype, devtype))
480480
goto tag;
481481
}
482482
return 0;

‎src/libudev/libudev-queue.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu
467467
udev_list_entry_add(&udev_queue->queue_list, syspath, seqnum_str);
468468
} else {
469469
udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_queue->queue_list)) {
470-
if (strcmp(seqnum_str, udev_list_entry_get_value(list_entry)) == 0) {
470+
if (streq(seqnum_str, udev_list_entry_get_value(list_entry))) {
471471
udev_list_entry_delete(list_entry);
472472
break;
473473
}

‎src/libudev/libudev-util.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
8383
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
8484
char *buf = alloca(buflen);
8585

86-
if (strcmp(user, "root") == 0)
86+
if (streq(user, "root"))
8787
return 0;
8888
uid = strtoul(user, &endptr, 10);
8989
if (endptr[0] == '\0')
@@ -108,7 +108,7 @@ gid_t util_lookup_group(struct udev *udev, const char *group)
108108
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
109109
char *buf = NULL;
110110

111-
if (strcmp(group, "root") == 0)
111+
if (streq(group, "root"))
112112
return 0;
113113
gid = strtoul(group, &endptr, 10);
114114
if (endptr[0] == '\0')

‎src/libudev/libudev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ _public_ struct udev *udev_new(void)
191191
val++;
192192
}
193193

194-
if (strcmp(key, "udev_log") == 0) {
194+
if (streq(key, "udev_log")) {
195195
udev_set_log_priority(udev, util_log_priority(val));
196196
continue;
197197
}

‎src/test/test-udev.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ int main(int argc, char *argv[])
140140
if (udev_device_get_devnode(dev) != NULL) {
141141
mode_t mode = 0600;
142142

143-
if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
143+
if (streq(udev_device_get_subsystem(dev), "block"))
144144
mode |= S_IFBLK;
145145
else
146146
mode |= S_IFCHR;
147147

148-
if (strcmp(action, "remove") != 0) {
148+
if (!streq(action, "remove")) {
149149
mkdir_parents_label(udev_device_get_devnode(dev), 0755);
150150
mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
151151
} else {

‎src/udev/accelerometer/accelerometer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ string_to_orientation (const char *orientation)
122122
if (orientation == NULL)
123123
return ORIENTATION_UNDEFINED;
124124
for (i = 0; orientations[i] != NULL; i++) {
125-
if (strcmp (orientation, orientations[i]) == 0)
125+
if (streq (orientation, orientations[i]))
126126
return i;
127127
}
128128
return ORIENTATION_UNDEFINED;

‎src/udev/collect/collect.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static void invite(char *us)
213213
udev_list_node_foreach(him_node, &bunch) {
214214
struct _mate *him = node_to_mate(him_node);
215215

216-
if (!strcmp(him->name, us)) {
216+
if (streq(him->name, us)) {
217217
him->state = STATE_CONFIRMED;
218218
who = him;
219219
}
@@ -241,7 +241,7 @@ static void reject(char *us)
241241
udev_list_node_foreach(him_node, &bunch) {
242242
struct _mate *him = node_to_mate(him_node);
243243

244-
if (!strcmp(him->name, us)) {
244+
if (streq(him->name, us)) {
245245
him->state = STATE_NONE;
246246
who = him;
247247
}
@@ -434,7 +434,7 @@ int main(int argc, char **argv)
434434
udev_list_node_foreach(him_node, &bunch) {
435435
struct _mate *him = node_to_mate(him_node);
436436

437-
if (!strcmp(him->name, argv[i]))
437+
if (streq(him->name, argv[i]))
438438
who = him;
439439
}
440440
if (!who) {

‎src/udev/scsi_id/scsi_id.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,11 @@ static int set_options(struct udev *udev,
372372
exit(0);
373373

374374
case 'p':
375-
if (strcmp(optarg, "0x80") == 0) {
375+
if (streq(optarg, "0x80")) {
376376
default_page_code = PAGE_80;
377-
} else if (strcmp(optarg, "0x83") == 0) {
377+
} else if (streq(optarg, "0x83")) {
378378
default_page_code = PAGE_83;
379-
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
379+
} else if (streq(optarg, "pre-spc3-83")) {
380380
default_page_code = PAGE_83_PRE_SPC3;
381381
} else {
382382
log_error("Unknown page code '%s'\n", optarg);
@@ -449,11 +449,11 @@ static int per_dev_options(struct udev *udev,
449449
break;
450450

451451
case 'p':
452-
if (strcmp(optarg, "0x80") == 0) {
452+
if (streq(optarg, "0x80")) {
453453
*page_code = PAGE_80;
454-
} else if (strcmp(optarg, "0x83") == 0) {
454+
} else if (streq(optarg, "0x83")) {
455455
*page_code = PAGE_83;
456-
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
456+
} else if (streq(optarg, "pre-spc3-83")) {
457457
*page_code = PAGE_83_PRE_SPC3;
458458
} else {
459459
log_error("Unknown page code '%s'\n", optarg);

0 commit comments

Comments
 (0)