From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 11 Feb 2021 09:40:56 +0000 (+0100)
Subject: lxclock: convert to strnprintf()
X-Git-Tag: lxc-5.0.0~292^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff88c2b4af4bbe9a4707d4502e1eeb9dc9d57bf0;p=thirdparty%2Flxc.git

lxclock: convert to strnprintf()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index 361cde92b..a6a43cef2 100644
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -103,17 +103,17 @@ static char *lxclock_name(const char *p, const char *n)
 	if (!dest)
 		return NULL;
 
-	ret = snprintf(dest, len, "%s/lxc/lock/%s", rundir, p);
-	if (ret < 0 || (size_t)ret >= len)
-		return ret_set_errno(NULL, EIO);
+	ret = strnprintf(dest, len, "%s/lxc/lock/%s", rundir, p);
+	if (ret < 0)
+		return NULL;
 
 	ret = mkdir_p(dest, 0755);
 	if (ret < 0)
 		return NULL;
 
-	ret = snprintf(dest, len, "%s/lxc/lock/%s/.%s", rundir, p, n);
-	if (ret < 0 || (size_t)ret >= len)
-		return ret_set_errno(NULL, EIO);
+	ret = strnprintf(dest, len, "%s/lxc/lock/%s/.%s", rundir, p, n);
+	if (ret < 0)
+		return NULL;
 
 	return move_ptr(dest);
 }