diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-02 11:27:16 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-02 11:27:22 +0200 |
| commit | ca2145bef250927a9fc05049890c8ffe248bd948 (patch) | |
| tree | c073d40e5a2ed2d3ef7dc4fc7ce7f818ef7f9e97 | |
| parent | 1e4dd486984cb4fd2ddc81b39b57916c927a4899 (diff) | |
| download | NetworkManager-ca2145bef250927a9fc05049890c8ffe248bd948.tar.gz | |
core: minor fix in nm_utils_kill_child_sync() having side-effects in MIN() macro (again)
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/NetworkManagerUtils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index ed44839087..f4c3df9f5e 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -539,8 +539,8 @@ nm_utils_kill_child_sync (pid_t pid, int sig, guint64 log_domain, const char *lo if (loop_count < 20) { /* At the beginning we expect the process to die fast. * Limit the sleep time, the limit doubles with every iteration. */ - loop_count++; sleep_time = MIN (sleep_time, (((guint64) 1) << loop_count) * G_USEC_PER_SEC / 2000); + loop_count++; } g_usleep (sleep_time); } |