chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d61671
)
use strneq instead of strncmp
author
Thomas Hindoe Paaboel Andersen
<phomes@gmail.com>
Tue, 12 Feb 2013 20:47:36 +0000
(21:47 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 12 Feb 2013 23:56:13 +0000
(
00:56
+0100)
15 files changed:
src/core/load-fragment.c
patch
|
blob
|
history
src/delta/delta.c
patch
|
blob
|
history
src/libudev/libudev-enumerate.c
patch
|
blob
|
history
src/locale/localed.c
patch
|
blob
|
history
src/login/logind-inhibit.c
patch
|
blob
|
history
src/login/sd-login.c
patch
|
blob
|
history
src/shared/cgroup-util.c
patch
|
blob
|
history
src/shared/env-util.c
patch
|
blob
|
history
src/shared/socket-util.c
patch
|
blob
|
history
src/shared/util.c
patch
|
blob
|
history
src/stdio-bridge/stdio-bridge.c
patch
|
blob
|
history
src/udev/scsi_id/scsi_id.c
patch
|
blob
|
history
src/udev/scsi_id/scsi_serial.c
patch
|
blob
|
history
src/udev/udev-builtin-net_id.c
patch
|
blob
|
history
src/udev/udev-rules.c
patch
|
blob
|
history
diff --git
a/src/core/load-fragment.c
b/src/core/load-fragment.c
index 44698d46e525c1c38c0552429b5a218efdc942f1..6e333aaf1599cd3a91f1d202d39b412da25716be 100644
(file)
--- a/
src/core/load-fragment.c
+++ b/
src/core/load-fragment.c
@@
-459,7
+459,7
@@
int config_parse_exec(
k = 0;
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
k = 0;
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- if (strn
cmp(w, ";", MAX(l, 1U)) == 0
)
+ if (strn
eq(w, ";", MAX(l, 1U))
)
break;
k++;
break;
k++;
@@
-471,9
+471,9
@@
int config_parse_exec(
k = 0;
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
k = 0;
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- if (strn
cmp(w, ";", MAX(l, 1U)) == 0
)
+ if (strn
eq(w, ";", MAX(l, 1U))
)
break;
break;
- else if (strn
cmp(w, "\\;", MAX(l, 1U)) == 0
)
+ else if (strn
eq(w, "\\;", MAX(l, 1U))
)
w ++;
if (honour_argv0 && w == rvalue) {
w ++;
if (honour_argv0 && w == rvalue) {
@@
-2670,7
+2670,7
@@
void unit_dump_config_items(FILE *f) {
prefix_len = dot-i;
if (dot)
prefix_len = dot-i;
if (dot)
- if (!prev ||
strncmp(prev, i, prefix_len+1) != 0
) {
+ if (!prev ||
!strneq(prev, i, prefix_len+1)
) {
if (prev)
fputc('\n', f);
if (prev)
fputc('\n', f);
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 9f20938516280f905153601af48010bcac6777d2..16b10021b78f0159a57305eac4b091f95c4cc25a 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-312,17
+312,17
@@
static int parse_flags(const char *flag_str, int flags) {
size_t l;
FOREACH_WORD(w, l, flag_str, state) {
size_t l;
FOREACH_WORD(w, l, flag_str, state) {
- if (strn
cmp("masked", w, l) == 0
)
+ if (strn
eq("masked", w, l)
)
flags |= SHOW_MASKED;
flags |= SHOW_MASKED;
- else if (strn
cmp ("equivalent", w, l) == 0
)
+ else if (strn
eq ("equivalent", w, l)
)
flags |= SHOW_EQUIVALENT;
flags |= SHOW_EQUIVALENT;
- else if (strn
cmp("redirected", w, l) == 0
)
+ else if (strn
eq("redirected", w, l)
)
flags |= SHOW_REDIRECTED;
flags |= SHOW_REDIRECTED;
- else if (strn
cmp("overridden", w, l) == 0
)
+ else if (strn
eq("overridden", w, l)
)
flags |= SHOW_OVERRIDDEN;
flags |= SHOW_OVERRIDDEN;
- else if (strn
cmp("unchanged", w, l) == 0
)
+ else if (strn
eq("unchanged", w, l)
)
flags |= SHOW_UNCHANGED;
flags |= SHOW_UNCHANGED;
- else if (strn
cmp("default", w, l) == 0
)
+ else if (strn
eq("default", w, l)
)
flags |= SHOW_DEFAULTS;
else
return -EINVAL;
flags |= SHOW_DEFAULTS;
else
return -EINVAL;
diff --git
a/src/libudev/libudev-enumerate.c
b/src/libudev/libudev-enumerate.c
index 2c1f7ab4ace4d3cfc7cf5618afef6bb340742f8b..5ccaabdc6cdbed7062cd3bf4997533602118d520 100644
(file)
--- a/
src/libudev/libudev-enumerate.c
+++ b/
src/libudev/libudev-enumerate.c
@@
-309,7
+309,7
@@
_public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
}
if (move_later &&
}
if (move_later &&
-
strncmp(entry->syspath, move_later->syspath, move_later_prefix) != 0
) {
+
!strneq(entry->syspath, move_later->syspath, move_later_prefix)
) {
udev_list_entry_add(&udev_enumerate->devices_list, move_later->syspath, NULL);
move_later = NULL;
udev_list_entry_add(&udev_enumerate->devices_list, move_later->syspath, NULL);
move_later = NULL;
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index 6b1a793d3b44f2aab179f49978985ca8a755aa6b..fedcdfb373c83899a2fcf12357f6cf1ce233b4f6 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-854,7
+854,7
@@
static int convert_x11_to_vconsole(DBusConnection *connection) {
* layout stripped off. */
if (x > 0 &&
strlen(a[1]) == x &&
* layout stripped off. */
if (x > 0 &&
strlen(a[1]) == x &&
- strn
cmp(state.x11_layout, a[1], x) == 0
)
+ strn
eq(state.x11_layout, a[1], x)
)
matching = 5;
else {
size_t w;
matching = 5;
else {
size_t w;
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index f1b9cca834c95eb1b40c68646e5fc45b990d8a5c..2c1a412e55d9f5fcc5f57b8dc8296fadde2f240c 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-439,19
+439,19
@@
InhibitWhat inhibit_what_from_string(const char *s) {
size_t l;
FOREACH_WORD_SEPARATOR(w, l, s, ":", state) {
size_t l;
FOREACH_WORD_SEPARATOR(w, l, s, ":", state) {
- if (l == 8 && strn
cmp(w, "shutdown", l) == 0
)
+ if (l == 8 && strn
eq(w, "shutdown", l)
)
what |= INHIBIT_SHUTDOWN;
what |= INHIBIT_SHUTDOWN;
- else if (l == 5 && strn
cmp(w, "sleep", l) == 0
)
+ else if (l == 5 && strn
eq(w, "sleep", l)
)
what |= INHIBIT_SLEEP;
what |= INHIBIT_SLEEP;
- else if (l == 4 && strn
cmp(w, "idle", l) == 0
)
+ else if (l == 4 && strn
eq(w, "idle", l)
)
what |= INHIBIT_IDLE;
what |= INHIBIT_IDLE;
- else if (l == 16 && strn
cmp(w, "handle-power-key", l) == 0
)
+ else if (l == 16 && strn
eq(w, "handle-power-key", l)
)
what |= INHIBIT_HANDLE_POWER_KEY;
what |= INHIBIT_HANDLE_POWER_KEY;
- else if (l == 18 && strn
cmp(w, "handle-suspend-key", l) == 0
)
+ else if (l == 18 && strn
eq(w, "handle-suspend-key", l)
)
what |= INHIBIT_HANDLE_SUSPEND_KEY;
what |= INHIBIT_HANDLE_SUSPEND_KEY;
- else if (l == 20 && strn
cmp(w, "handle-hibernate-key", l) == 0
)
+ else if (l == 20 && strn
eq(w, "handle-hibernate-key", l)
)
what |= INHIBIT_HANDLE_HIBERNATE_KEY;
what |= INHIBIT_HANDLE_HIBERNATE_KEY;
- else if (l == 17 && strn
cmp(w, "handle-lid-switch", l) == 0
)
+ else if (l == 17 && strn
eq(w, "handle-lid-switch", l)
)
what |= INHIBIT_HANDLE_LID_SWITCH;
else
return _INHIBIT_WHAT_INVALID;
what |= INHIBIT_HANDLE_LID_SWITCH;
else
return _INHIBIT_WHAT_INVALID;
diff --git
a/src/login/sd-login.c
b/src/login/sd-login.c
index 4bc51e71a253ab4fea5fbcf8528ccb9b87868369..b81dddf86ba79d36259fd544476ca754ff3c2e8f 100644
(file)
--- a/
src/login/sd-login.c
+++ b/
src/login/sd-login.c
@@
-196,7
+196,7
@@
_public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat)
}
FOREACH_WORD(w, l, s, state) {
}
FOREACH_WORD(w, l, s, state) {
- if (strn
cmp(t, w, l) == 0
) {
+ if (strn
eq(t, w, l)
) {
free(s);
free(t);
free(s);
free(t);
diff --git
a/src/shared/cgroup-util.c
b/src/shared/cgroup-util.c
index acace52bc8daaa7ab2299e85f2108fec27e63762..7efbc2ed39349f601f4f387db8a00f71f559f11c 100644
(file)
--- a/
src/shared/cgroup-util.c
+++ b/
src/shared/cgroup-util.c
@@
-811,7
+811,7
@@
int cg_get_by_pid(const char *controller, pid_t pid, char **path) {
continue;
l++;
continue;
l++;
- if (
strncmp(l, controller, cs) != 0
)
+ if (
!strneq(l, controller, cs)
)
continue;
if (l[cs] != ':')
continue;
if (l[cs] != ':')
diff --git
a/src/shared/env-util.c
b/src/shared/env-util.c
index 9a833d22e4d176208088e73ff9aeba2d10e4c18e..0f1ac9294bd1c61a12eaeb99cb075b55d28e7d88 100644
(file)
--- a/
src/shared/env-util.c
+++ b/
src/shared/env-util.c
@@
-128,7
+128,7
@@
bool strv_env_is_valid(char **e) {
/* Check if there are duplicate assginments */
k = strcspn(*p, "=");
STRV_FOREACH(q, p + 1)
/* Check if there are duplicate assginments */
k = strcspn(*p, "=");
STRV_FOREACH(q, p + 1)
- if (strn
cmp(*p, *q, k) == 0
&& (*q)[k] == '=')
+ if (strn
eq(*p, *q, k)
&& (*q)[k] == '=')
return false;
}
return false;
}
@@
-171,7
+171,7
@@
static int env_append(char **r, char ***k, char **a) {
n++;
for (j = r; j < *k; j++)
n++;
for (j = r; j < *k; j++)
- if (strn
cmp(*j, *a, n) == 0
)
+ if (strn
eq(*j, *a, n)
)
break;
if (j >= *k)
break;
if (j >= *k)
@@
-247,7
+247,7
@@
static bool env_match(const char *t, const char *pattern) {
if (!strchr(pattern, '=')) {
size_t l = strlen(pattern);
if (!strchr(pattern, '=')) {
size_t l = strlen(pattern);
- return strn
cmp(t, pattern, l) == 0
&& t[l] == '=';
+ return strn
eq(t, pattern, l)
&& t[l] == '=';
}
return false;
}
return false;
@@
-363,7
+363,7
@@
char *strv_env_get_n(char **l, const char *name, size_t k) {
return NULL;
STRV_FOREACH(i, l)
return NULL;
STRV_FOREACH(i, l)
- if (strn
cmp(*i, name, k) == 0
&&
+ if (strn
eq(*i, name, k)
&&
(*i)[k] == '=')
return *i + k + 1;
(*i)[k] == '=')
return *i + k + 1;
@@
-391,7
+391,7
@@
char **strv_env_clean(char **e) {
n = strcspn(*p, "=");
STRV_FOREACH(q, p + 1)
n = strcspn(*p, "=");
STRV_FOREACH(q, p + 1)
- if (strn
cmp(*p, *q, n) == 0
&& (*q)[n] == '=') {
+ if (strn
eq(*p, *q, n)
&& (*q)[n] == '=') {
duplicate = true;
break;
}
duplicate = true;
break;
}
diff --git
a/src/shared/socket-util.c
b/src/shared/socket-util.c
index 56ec99f442388e2779ba7401a5005368e6c61cd6..39b6142e88493565683a30baa3746bf68c212bdf 100644
(file)
--- a/
src/shared/socket-util.c
+++ b/
src/shared/socket-util.c
@@
-432,7
+432,7
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
return false;
if (a->sockaddr.un.sun_path[0]) {
return false;
if (a->sockaddr.un.sun_path[0]) {
- if (
strncmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0
)
+ if (
!strneq(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path))
)
return false;
} else {
if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0)
return false;
} else {
if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0)
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 24f9e7ee58338c4ad293012e7811671e3a1dad9e..8dceb820516fe4ac83dc4b2f4afc3ad26e4ef0d8 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-720,7
+720,7
@@
int parse_env_file(
value = va_arg(ap, char **);
n = strlen(key);
value = va_arg(ap, char **);
n = strlen(key);
- if (
strncmp(p, key, n) != 0
||
+ if (
!strneq(p, key, n)
||
p[n] != '=')
continue;
p[n] != '=')
continue;
diff --git
a/src/stdio-bridge/stdio-bridge.c
b/src/stdio-bridge/stdio-bridge.c
index f926fe55381275872dfb582645570f6ad1aadf87..adc692f1eba92d2155bd38173e1d72dab9cf1ffd 100644
(file)
--- a/
src/stdio-bridge/stdio-bridge.c
+++ b/
src/stdio-bridge/stdio-bridge.c
@@
-69,16
+69,16
@@
static size_t patch_in_line(char *line, size_t l, size_t left) {
} else
r = 0;
} else
r = 0;
- if (l == 5 && strn
cmp(line, "BEGIN", 5) == 0
) {
+ if (l == 5 && strn
eq(line, "BEGIN", 5)
) {
r += l;
auth_over = true;
r += l;
auth_over = true;
- } else if (l == 17 && strn
cmp(line, "NEGOTIATE_UNIX_FD", 17) == 0
) {
+ } else if (l == 17 && strn
eq(line, "NEGOTIATE_UNIX_FD", 17)
) {
memmove(line + 13, line + 17, left);
memcpy(line, "NEGOTIATE_NOP", 13);
r += 13;
memmove(line + 13, line + 17, left);
memcpy(line, "NEGOTIATE_NOP", 13);
r += 13;
- } else if (l >= 14 && strn
cmp(line, "AUTH EXTERNAL ", 14) == 0
) {
+ } else if (l >= 14 && strn
eq(line, "AUTH EXTERNAL ", 14)
) {
char uid[20*2 + 1];
size_t len;
char uid[20*2 + 1];
size_t len;
diff --git
a/src/udev/scsi_id/scsi_id.c
b/src/udev/scsi_id/scsi_id.c
index fa0413c462fbdde5bdea0e8f2d705224317c7fe3..d664787fd9c8846e237fb4563056eae2a04eecd3 100644
(file)
--- a/
src/udev/scsi_id/scsi_id.c
+++ b/
src/udev/scsi_id/scsi_id.c
@@
-267,10
+267,10
@@
static int get_file_options(struct udev *udev,
if (vendor == NULL) {
if (vendor_in == NULL)
break;
if (vendor == NULL) {
if (vendor_in == NULL)
break;
- } else if ((vendor_in && strn
cmp
(vendor, vendor_in,
- strlen(vendor_in))
== 0
) &&
- (!model_in || (strn
cmp
(model, model_in,
- strlen(model_in))
== 0
))) {
+ } else if ((vendor_in && strn
eq
(vendor, vendor_in,
+ strlen(vendor_in))) &&
+ (!model_in || (strn
eq
(model, model_in,
+ strlen(model_in))))) {
/*
* Matched vendor and optionally model.
*
/*
* Matched vendor and optionally model.
*
diff --git
a/src/udev/scsi_id/scsi_serial.c
b/src/udev/scsi_id/scsi_serial.c
index 950b8adc0acdaac5cdc36fa19d829d0c9fd7e826..d522a23a088c0af01145d0d2ee0c8eeb953fdf0d 100644
(file)
--- a/
src/udev/scsi_id/scsi_serial.c
+++ b/
src/udev/scsi_id/scsi_serial.c
@@
-436,7
+436,7
@@
static int do_scsi_page0_inquiry(struct udev *udev,
* If the vendor id appears in the page assume the page is
* invalid.
*/
* If the vendor id appears in the page assume the page is
* invalid.
*/
- if (
!strncmp
((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
+ if (
strneq
((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
log_debug("%s: invalid page0 data\n", dev_scsi->kernel);
return 1;
}
log_debug("%s: invalid page0 data\n", dev_scsi->kernel);
return 1;
}
diff --git
a/src/udev/udev-builtin-net_id.c
b/src/udev/udev-builtin-net_id.c
index 7ffdaad73fa2389225ce997ca1db276b0758444e..c55c34d614037c53136350118bf1ef282b73326b 100644
(file)
--- a/
src/udev/udev-builtin-net_id.c
+++ b/
src/udev/udev-builtin-net_id.c
@@
-223,7
+223,7
@@
static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
snprintf(str, sizeof(str), "%s/%s/address", slots, dent->d_name);
if (read_one_line_file(str, &address) >= 0) {
/* match slot address with device by stripping the function */
snprintf(str, sizeof(str), "%s/%s/address", slots, dent->d_name);
if (read_one_line_file(str, &address) >= 0) {
/* match slot address with device by stripping the function */
- if (strn
cmp(address, udev_device_get_sysname(names->pcidev), strlen(address)) == 0
)
+ if (strn
eq(address, udev_device_get_sysname(names->pcidev), strlen(address))
)
hotplug_slot = i;
free(address);
}
hotplug_slot = i;
free(address);
}
diff --git
a/src/udev/udev-rules.c
b/src/udev/udev-rules.c
index a86f8c365a958db2708a2e9017d9fd27a4f1eeb6..d2810a01d82ecf7140a8e519cde588ce4fd210c5 100644
(file)
--- a/
src/udev/udev-rules.c
+++ b/
src/udev/udev-rules.c
@@
-1737,7
+1737,7
@@
static int match_key(struct udev_rules *rules, struct token *token, const char *
if (next != NULL) {
size_t matchlen = (size_t)(next - s);
if (next != NULL) {
size_t matchlen = (size_t)(next - s);
- match = (matchlen == len && strn
cmp(s, val, matchlen) == 0
);
+ match = (matchlen == len && strn
eq(s, val, matchlen)
);
if (match)
break;
} else {
if (match)
break;
} else {