diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-17 09:33:59 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-17 09:33:59 +0100 |
| commit | bf7e619b3b2b97ff2a4952ab125c794c0d3bdb5f (patch) | |
| tree | 9b94bf28557da6f2d5a78da20c44b5da9b8e8676 /src/basic/util.c | |
| parent | f1f8a5a5e110f485257e8702ad30b9997e529a74 (diff) | |
| parent | 6059dab8897ecd24a51a6601499c1bb9002bc54a (diff) | |
Merge pull request #1924 from poettering/some-fixes-2
casting fixes, another siphash24 alignment fix, and more
Diffstat (limited to 'src/basic/util.c')
| -rw-r--r-- | src/basic/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index 3e4ec42a28..58617b354a 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -206,7 +206,7 @@ static int do_execute(char **directories, usec_t timeout, char *argv[]) { log_debug("Spawned %s as " PID_FMT ".", path, pid); - r = hashmap_put(pids, UINT_TO_PTR(pid), path); + r = hashmap_put(pids, PID_TO_PTR(pid), path); if (r < 0) return log_oom(); path = NULL; @@ -224,10 +224,10 @@ static int do_execute(char **directories, usec_t timeout, char *argv[]) { _cleanup_free_ char *path = NULL; pid_t pid; - pid = PTR_TO_UINT(hashmap_first_key(pids)); + pid = PTR_TO_PID(hashmap_first_key(pids)); assert(pid > 0); - path = hashmap_remove(pids, UINT_TO_PTR(pid)); + path = hashmap_remove(pids, PID_TO_PTR(pid)); assert(path); wait_for_terminate_and_warn(path, pid, true); |