]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
cmd: Do not reassign variable before it is used
authorTobin C. Harding <me@tobin.cc>
Mon, 20 Aug 2018 06:28:39 +0000 (16:28 +1000)
committerTobin C. Harding <me@tobin.cc>
Mon, 20 Aug 2018 23:25:30 +0000 (09:25 +1000)
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 <me@tobin.cc>
src/lxc/cmd/lxc_user_nic.c

index 153940b86b93619af9a26827d538e57cf9cd3f60..cc73124476e782d6eaedcfe0b5f62b1921a331c2 100644 (file)
@@ -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();