chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-policy: append items rather than prepending them
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 502b3675b1d543fec6b082b46f317b4ffeb5f58e..30b0364b64cb7e0edf3d7803a7322ac0d758fdb7 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-1878,9
+1878,6
@@
int open_terminal(const char *name, int mode) {
c++;
}
c++;
}
- if (fd < 0)
- return -errno;
-
r = isatty(fd);
if (r < 0) {
safe_close(fd);
r = isatty(fd);
if (r < 0) {
safe_close(fd);
@@
-3911,7
+3908,7
@@
void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv
}
}
}
}
- pids = hashmap_new(NULL
, NULL
);
+ pids = hashmap_new(NULL);
if (!pids) {
log_oom();
_exit(EXIT_FAILURE);
if (!pids) {
log_oom();
_exit(EXIT_FAILURE);
@@
-6694,7
+6691,7
@@
int bind_remount_recursive(const char *prefix, bool ro) {
path_kill_slashes(cleaned);
path_kill_slashes(cleaned);
- done = set_new(
string_hash_func, string_compare_func
);
+ done = set_new(
&string_hash_ops
);
if (!done)
return -ENOMEM;
if (!done)
return -ENOMEM;
@@
-6704,7
+6701,7
@@
int bind_remount_recursive(const char *prefix, bool ro) {
bool top_autofs = false;
char *x;
bool top_autofs = false;
char *x;
- todo = set_new(
string_hash_func, string_compare_func
);
+ todo = set_new(
&string_hash_ops
);
if (!todo)
return -ENOMEM;
if (!todo)
return -ENOMEM;