From: Wolfgang Bumiller Date: Wed, 6 Sep 2017 09:45:03 +0000 (+0200) Subject: cleanup: remove unnecessary zeroing X-Git-Tag: lxc-3.0.0.beta1~250^2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1792%2Fhead;p=thirdparty%2Flxc.git cleanup: remove unnecessary zeroing The entire netdev is zeroed via memset() already. Unions and all. Signed-off-by: Wolfgang Bumiller --- diff --git a/src/lxc/confile_legacy.c b/src/lxc/confile_legacy.c index 80dd3851e..93df47376 100644 --- a/src/lxc/confile_legacy.c +++ b/src/lxc/confile_legacy.c @@ -170,16 +170,6 @@ int set_config_network_legacy_type(const char *key, const char *value, lxc_list_init(&netdev->ipv4); lxc_list_init(&netdev->ipv6); - netdev->name[0] = '\0'; - netdev->link[0] = '\0'; - memset(&netdev->priv, 0, sizeof(netdev->priv)); - /* I'm not completely sure if the memset takes care to zero the arrays - * in the union as well. So let's make extra sure and set the first byte - * to zero so that we don't have any surprises. - */ - netdev->priv.veth_attr.pair[0] = '\0'; - netdev->priv.veth_attr.veth1[0] = '\0'; - list = malloc(sizeof(*list)); if (!list) { SYSERROR("failed to allocate memory"); diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c index 02924fa93..d43d516db 100644 --- a/src/lxc/confile_utils.c +++ b/src/lxc/confile_utils.c @@ -183,15 +183,6 @@ struct lxc_netdev *lxc_network_add(struct lxc_list *networks, int idx, bool tail memset(netdev, 0, sizeof(*netdev)); lxc_list_init(&netdev->ipv4); lxc_list_init(&netdev->ipv6); - netdev->name[0] = '\0'; - netdev->link[0] = '\0'; - memset(&netdev->priv, 0, sizeof(netdev->priv)); - /* I'm not completely sure if the memset takes care to zero the arrays - * in the union as well. So let's make extra sure and set the first byte - * to zero so that we don't have any surprises. - */ - netdev->priv.veth_attr.pair[0] = '\0'; - netdev->priv.veth_attr.veth1[0] = '\0'; /* give network a unique index */ netdev->idx = idx;