From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Thu, 16 Oct 2014 13:14:00 +0000 (+0000)
Subject: c/r: use sizeof instead of magic numbers
X-Git-Tag: lxc-1.1.0.alpha3~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e311a562356f18e960fef5a1b711673a85d240b4;p=thirdparty%2Flxc.git

c/r: use sizeof instead of magic numbers

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index d1f41c7f2..d3b604695 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3639,16 +3639,16 @@ static void exec_criu(struct criu_opts *opts)
 			struct lxc_netdev *n = it->elem;
 
 			if (n->name) {
-				if (strlen(n->name) >= 128)
+				if (strlen(n->name) >= sizeof(eth))
 					goto err;
-				strncpy(eth, n->name, 128);
+				strncpy(eth, n->name, sizeof(eth));
 			} else
 				sprintf(eth, "eth%d", netnr);
 
 			veth = n->priv.veth_attr.pair;
 
-			ret = snprintf(buf, 257, "%s=%s", eth, veth);
-			if (ret < 0 || ret >= 257)
+			ret = snprintf(buf, sizeof(buf), "%s=%s", eth, veth);
+			if (ret < 0 || ret >= sizeof(buf))
 				goto err;
 
 			/* final NULL and --veth-pair eth0=vethASDF */