chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use strneq instead of strncmp
[elogind.git]
/
src
/
shared
/
env-util.c
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;
}