diff options
| author | Guillem Jover <guillem@debian.org> | 2013-12-17 23:07:42 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2014-01-15 05:50:28 +0100 |
| commit | 1c2b693e0b9de39dd27e715ae538f87a93ad3adc (patch) | |
| tree | 32c068531a83b2c8e72e0077024f582067c98f21 /utils | |
| parent | d6341c151bc3e585170d231af9ef7db4f606ef46 (diff) | |
| download | dpkg-1c2b693e0b9de39dd27e715ae538f87a93ad3adc.tar.gz | |
Rename return code variables from r to rc
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/start-stop-daemon.c | 6 | ||||
| -rw-r--r-- | utils/update-alternatives.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index b15de6614..77a66e6ad 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -1709,7 +1709,7 @@ static bool do_stop_timeout(int timeout, int *n_killed, int *n_notkilled) { struct timeval stopat, before, after, interval, maxinterval; - int r, ratio; + int rc, ratio; xgettimeofday(&stopat); stopat.tv_sec += timeout; @@ -1745,8 +1745,8 @@ do_stop_timeout(int timeout, int *n_killed, int *n_notkilled) interval.tv_usec <= MIN_POLL_INTERVAL) interval.tv_usec = MIN_POLL_INTERVAL; - r = select(0, NULL, NULL, NULL, &interval); - if (r < 0 && errno != EINTR) + rc = select(0, NULL, NULL, NULL, &interval); + if (rc < 0 && errno != EINTR) fatal("select() failed for pause"); } } diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c index 987a15161..201805979 100644 --- a/utils/update-alternatives.c +++ b/utils/update-alternatives.c @@ -466,10 +466,12 @@ rename_mv(const char *src, const char *dst) if (rename(src, dst) != 0) { const char *args[] = { "mv", src, dst, NULL }; - int r; - r = spawn("mv", args); - if (WIFEXITED(r) && WEXITSTATUS(r) == 0) + int rc; + + rc = spawn("mv", args); + if (WIFEXITED(rc) && WEXITSTATUS(rc) == 0) return true; + return false; } |