chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-socket-util: silence warnings
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 88511b69c0a805c0a4ad627028efc4627bf34bf7..75dc58b63db2edeceab89b3c279a53924a2094de 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-3795,7
+3795,7
@@
bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
return endswith(de->d_name, suffix);
}
return endswith(de->d_name, suffix);
}
-void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv[]
, char *env[]
) {
+void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv[]) {
pid_t executor_pid;
int r;
pid_t executor_pid;
int r;
@@
-3826,14
+3826,6
@@
void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv
assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
- if (!strv_isempty(env)) {
- char **i;
-
- STRV_FOREACH(i, env)
- putenv(*i);
- }
-
-
if (!d) {
d = _d = opendir(directory);
if (!d) {
if (!d) {
d = _d = opendir(directory);
if (!d) {
@@
-5427,7
+5419,7
@@
bool string_has_cc(const char *p, const char *ok) {
for (t = p; *t; t++) {
if (ok && strchr(ok, *t))
for (t = p; *t; t++) {
if (ok && strchr(ok, *t))
-
return fals
e;
+
continu
e;
if (*t > 0 && *t < ' ')
return true;
if (*t > 0 && *t < ' ')
return true;