summaryrefslogtreecommitdiff
path: root/glnx-fdio.c
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2022-04-24 11:11:20 +0100
committerSimon McVittie <smcv@collabora.com>2022-04-24 11:11:20 +0100
commit77c8aa3feaddb8d365d8113f7e58054776df261d (patch)
tree00e8c3aed6b11bd19783240797c8a8b06b692994 /glnx-fdio.c
parent238f7bfc494e16a0864f88ae891da6e7b3d82e5b (diff)
parent9f033ee2f6fb2b7ef238b4d6609d55a1e1e8e3e2 (diff)
downloadlibglnx-77c8aa3feaddb8d365d8113f7e58054776df261d.tar.gz
DO NOT MERGE: Merge branches 'wip/smcv/subproject' and 'wip/smcv/warnings'wip/smcv/for-flatpak-meson-build
See !34 and !35.
Diffstat (limited to 'glnx-fdio.c')
-rw-r--r--glnx-fdio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/glnx-fdio.c b/glnx-fdio.c
index b3a6239..ee69aa1 100644
--- a/glnx-fdio.c
+++ b/glnx-fdio.c
@@ -229,7 +229,7 @@ open_tmpfile_core (int dfd, const char *subpath,
const guint count_max = 100;
{ g_autofree char *tmp = g_strconcat (subpath, "/tmp.XXXXXX", NULL);
- for (int count = 0; count < count_max; count++)
+ for (guint count = 0; count < count_max; count++)
{
glnx_gen_temp_name (tmp);
@@ -660,7 +660,7 @@ glnx_file_get_contents_utf8_at (int dfd,
char *
glnx_readlinkat_malloc (int dfd,
const char *subpath,
- GCancellable *cancellable,
+ G_GNUC_UNUSED GCancellable *cancellable,
GError **error)
{
dfd = glnx_dirfd_canonicalize (dfd);
@@ -1106,7 +1106,7 @@ glnx_file_replace_contents_with_perms_at (int dfd,
uid_t uid,
gid_t gid,
GLnxFileReplaceFlags flags,
- GCancellable *cancellable,
+ G_GNUC_UNUSED GCancellable *cancellable,
GError **error)
{
char *dnbuf = strdupa (subpath);
@@ -1130,7 +1130,7 @@ glnx_file_replace_contents_with_perms_at (int dfd,
&tmpf, error))
return FALSE;
- if (len == -1)
+ if (len == (gsize) -1)
len = strlen ((char*)buf);
if (!glnx_try_fallocate (tmpf.fd, 0, len, error))