From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 3 Sep 2021 10:56:43 +0000 (+0200)
Subject: file_utils: fix integer comparisons
X-Git-Tag: lxc-5.0.0~92^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0e7af42adcb8ca5b3d5fe01568e2204bdaee9c;p=thirdparty%2Flxc.git

file_utils: fix integer comparisons

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

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index eaa9a5a40..f7e4fb378 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -259,14 +259,19 @@ bool file_exists(const char *f)
 int print_to_file(const char *file, const char *content)
 {
 	__do_fclose FILE *f = NULL;
-	int ret = 0;
+	int ret;
+	size_t len;
 
 	f = fopen(file, "we");
 	if (!f)
 		return -1;
 
-	if (fprintf(f, "%s", content) != strlen(content))
+	len = strlen(content);
+	ret = fprintf(f, "%s", content);
+	if (ret < 0 || (size_t)ret != len)
 		ret = -1;
+	else
+		ret = 0;
 
 	return ret;
 }
@@ -593,8 +598,7 @@ FILE *fdopen_at(int dfd, const char *path, const char *mode,
 int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset)
 {
 	__do_close int fd = -EBADF;
-	int ret;
-	ssize_t len;
+	ssize_t len, ret;
 	char buf[INTTYPE_TO_STRLEN(int) +
 		 STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) +
 		 STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) + 1];
@@ -611,7 +615,7 @@ int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset)
 		return ret_errno(EFBIG);
 
 	ret = lxc_write_nointr(fd, buf, len);
-	if (ret < 0 || (size_t)ret != len)
+	if (ret < 0 || ret != len)
 		return -EIO;
 
 	return 0;