]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
logger: shadow declaration
authorSami Kerola <kerolasa@iki.fi>
Sat, 31 Oct 2015 12:27:36 +0000 (12:27 +0000)
committerKarel Zak <kzak@redhat.com>
Fri, 6 Nov 2015 12:19:39 +0000 (13:19 +0100)
misc-utils/logger.c:448:17: warning: declaration of 'msg' shadows a
parameter [-Wshadow]
misc-utils/logger.c:429:74: note: shadowed declaration is here

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
misc-utils/logger.c

index eda160acd37fd165c99403246dea2a7cd38bc46a..e4392661203fb14a00254a3043aeffe8fd075ad2 100644 (file)
@@ -445,7 +445,7 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
        iovec_add_string(iov, iovlen, msg, 0);
 
        if (!ctl->noact) {
-               struct msghdr msg = { 0 };
+               struct msghdr message = { 0 };
                struct cmsghdr *cmhp;
                struct ucred *cred;
                union {
@@ -457,8 +457,8 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
                if ((ctl->socket_type == TYPE_TCP) && !ctl->octet_count)
                        iovec_add_string(iov, iovlen, "\n", 1);
 
-               msg.msg_iov = iov;
-               msg.msg_iovlen = iovlen;
+               message.msg_iov = iov;
+               message.msg_iovlen = iovlen;
 
                /* syslog/journald may follow local socket credentials rather
                 * than in the message PID. If we use --id as root than we can
@@ -468,10 +468,10 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
                if (ctl->pid && !ctl->server && ctl->pid != getpid()
                    && geteuid() == 0 && kill(ctl->pid, 0) == 0) {
 
-                       msg.msg_control = cbuf.control;
-                       msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
+                       message.msg_control = cbuf.control;
+                       message.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
 
-                       cmhp = CMSG_FIRSTHDR(&msg);
+                       cmhp = CMSG_FIRSTHDR(&message);
                        cmhp->cmsg_len = CMSG_LEN(sizeof(struct ucred));
                        cmhp->cmsg_level = SOL_SOCKET;
                        cmhp->cmsg_type = SCM_CREDENTIALS;
@@ -480,7 +480,7 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
                        cred->pid = ctl->pid;
                }
 
-               if (sendmsg(ctl->fd, &msg, 0) < 0)
+               if (sendmsg(ctl->fd, &message, 0) < 0)
                        warn(_("send message failed"));
        }