diff options
| author | Sami Kerola | 2015-10-03 20:31:07 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-10-09 11:17:12 +0200 |
| commit | fd346daf89860391f0687d76ddb2b1506ec15cdc (patch) | |
| tree | 07e38b0a075edc4af23a1ea5a6fbe7f59127e449 /misc-utils/uuidd.c | |
| parent | uuidd: use signalfd() and setup_timer() (diff) | |
| download | kernel-qcow2-util-linux-fd346daf89860391f0687d76ddb2b1506ec15cdc.tar.gz kernel-qcow2-util-linux-fd346daf89860391f0687d76ddb2b1506ec15cdc.tar.xz kernel-qcow2-util-linux-fd346daf89860391f0687d76ddb2b1506ec15cdc.zip | |
uuidd: fix shadow declaration
misc-utils/uuidd.c:384:13: warning: declaration of 'ret' shadows a previous
local [-Wshadow]
misc-utils/uuidd.c:327:6: note: shadowed declaration is here
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils/uuidd.c')
| -rw-r--r-- | misc-utils/uuidd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index c897372d5..2359f986f 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -381,15 +381,15 @@ static void server_loop(const char *socket_path, const char *pidfile_path, #ifdef HAVE_LIBSYSTEMD if (uuidd_cxt->no_sock) { - const int ret = sd_listen_fds(0); + const int r = sd_listen_fds(0); - if (ret < 0) { - errno = ret * -1; + if (r < 0) { + errno = r * -1; err(EXIT_FAILURE, _("sd_listen_fds() failed")); - } else if (ret == 0) + } else if (r == 0) errx(EXIT_FAILURE, _("no file descriptors received, check systemctl status uuidd.socket")); - else if (1 < ret) + else if (1 < r) errx(EXIT_FAILURE, _("too many file descriptors received, check uuidd.socket")); s = SD_LISTEN_FDS_START + 0; |