colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: minor fix in nm_utils_kill_child_sync() having side-effects in MIN() macro

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-10-01 16:15:00 +02:00
parent aadae3256e
commit 1e4dd48698
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/NetworkManagerUtils.c
View File

@@ -539,7 +539,8 @@ nm_utils_kill_child_sync (pid_t pid, int sig, guint64 log_domain, const char *lo
if (loop_count < 20) { if (loop_count < 20) {
/* At the beginning we expect the process to die fast. /* At the beginning we expect the process to die fast.
* Limit the sleep time, the limit doubles with every iteration. */ * Limit the sleep time, the limit doubles with every iteration. */
sleep_time = MIN (sleep_time, (((guint64) 1) << loop_count++) * G_USEC_PER_SEC / 2000); loop_count++;
sleep_time = MIN (sleep_time, (((guint64) 1) << loop_count) * G_USEC_PER_SEC / 2000);
} }
g_usleep (sleep_time); g_usleep (sleep_time);
} }