From ba464e9b6672cf1b3e96a0c0efb3ee55ad4156ee Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 20 Aug 2018 16:28:39 +1000 Subject: [PATCH] cmd: Do not reassign variable before it is used cppcheck emits warning Variable 'ofd' is reassigned a value before the old one has been used. We do not need to initialise a variable if it is assigned to on first use. Signed-off-by: Tobin C. Harding --- src/lxc/cmd/lxc_user_nic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c index 153940b86..cc7312447 100644 --- a/src/lxc/cmd/lxc_user_nic.c +++ b/src/lxc/cmd/lxc_user_nic.c @@ -862,12 +862,12 @@ again: static char *lxc_secure_rename_in_ns(int pid, char *oldname, char *newname, int *container_veth_ifidx) { - int ret; + int ofd, ret; pid_t pid_self; uid_t ruid, suid, euid; char ifname[IFNAMSIZ]; char *string_ret = NULL, *name = NULL; - int fd = -1, ifindex = -1, ofd = -1; + int fd = -1, ifindex = -1; pid_self = lxc_raw_getpid(); @@ -1035,11 +1035,10 @@ struct user_nic_args { static bool is_privileged_over_netns(int netns_fd) { - int ret; + int ofd, ret; pid_t pid_self; uid_t euid, ruid, suid; bool bret = false; - int ofd = -1; pid_self = lxc_raw_getpid(); -- 2.47.2