Skip to content

Commit

Permalink
file_utils: fix integer comparisons
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Oct 14, 2021
1 parent e712874 commit e0ffd0d
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/lxc/file_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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];
Expand All @@ -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;
Expand Down

0 comments on commit e0ffd0d

Please sign in to comment.