trivial: Fix several -Wsign-conversion issues on ARM

7 files changed, 27 insertions, 24 deletions

diff --git a/client/as-util.c b/client/as-util.c
index c3c525d..8d51ad8 100644
--- a/client/as-util.c
+++ b/client/as-util.c
@@ -3087,7 +3087,7 @@ as_util_mirror_screenshots_app_url (AsUtilPrivate *priv,
 		/* save new file */
 		ret = g_file_set_contents (cache_filename,
 					   msg->response_body->data,
-					   msg->response_body->length,
+					   (gssize) msg->response_body->length,
 					   error);
 		if (!ret)
 			goto out;
diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
index 4e435c8..f5f509f 100644
--- a/libappstream-glib/as-app-validate.c
+++ b/libappstream-glib/as-app-validate.c
@@ -486,7 +486,7 @@ ai_app_validate_image_check (AsImage *im, AsAppValidateHelper *helper)
 
 	/* create a buffer with the data */
 	stream = g_memory_input_stream_new_from_data (msg->response_body->data,
-						      msg->response_body->length,
+						      (gssize) msg->response_body->length,
 						      NULL);
 	if (stream == NULL) {
 		ai_app_validate_add (helper,
diff --git a/libappstream-glib/as-markup.c b/libappstream-glib/as-markup.c
index f2e1c55..1b185cc 100644
--- a/libappstream-glib/as-markup.c
+++ b/libappstream-glib/as-markup.c
@@ -192,18 +192,18 @@ as_markup_import_html_text_cb (GMarkupParseContext *context,
 static void
 as_markup_import_html_erase (GString *str, const gchar *start, const gchar *end)
 {
-	guint i, j;
-	guint start_len = (guint) strlen (start);
-	guint end_len = (guint) strlen (end);
+	gssize i, j;
+	gssize start_len = (gssize) strlen (start);
+	gssize end_len = (gssize) strlen (end);
 	for (i = 0; str->str[i] != '\0'; i++) {
-		if (memcmp (&str->str[i], start, start_len) != 0)
+		if (memcmp (&str->str[i], start, (gsize) start_len) != 0)
 			continue;
-		for (j = i; i < str->len; j++) {
-			if (memcmp (&str->str[j], end, end_len) != 0)
+		for (j = i; i < (gssize) str->len; j++) {
+			if (memcmp (&str->str[j], end, (gsize) end_len) != 0)
 				continue;
 			/* delete this section and restart the search */
 			g_string_erase (str, i, (j - i) + end_len);
-			i = (guint) -1;
+			i = -1;
 			break;
 		}
 	}
diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c
index c54f92d..bceb7b2 100644
--- a/libappstream-glib/as-node.c
+++ b/libappstream-glib/as-node.c
@@ -1324,17 +1324,17 @@ as_node_insert_line_breaks (const gchar *text, guint break_len)
 {
 	GString *str;
 	guint i;
-	guint new_len;
+	gssize new_len;
 
 	/* allocate long enough for the string, plus the extra newlines */
-	new_len = (guint) strlen (text) * (break_len + 1) / break_len;
+	new_len = (gssize) (strlen (text) * (break_len + 1) / break_len);
 	str = g_string_new_len (NULL, new_len + 2);
 	g_string_append (str, "\n");
 	g_string_append (str, text);
 
 	/* insert a newline every break length */
 	for (i = break_len + 1; i < str->len; i += break_len + 1)
-		g_string_insert (str, i, "\n");
+		g_string_insert (str, (gssize) i, "\n");
 	g_string_append (str, "\n");
 	return g_string_free (str, FALSE);
 }
diff --git a/libappstream-glib/as-store-cab.c b/libappstream-glib/as-store-cab.c
index 319155f..a46460e 100644
--- a/libappstream-glib/as-store-cab.c
+++ b/libappstream-glib/as-store-cab.c
@@ -461,7 +461,7 @@ as_store_cab_from_file (AsStore *store,
 
 	/* slurp it all */
 	size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
-	bytes = g_input_stream_read_bytes (input_stream, size,
+	bytes = g_input_stream_read_bytes (input_stream, (gsize) size,
 					   cancellable, &error_local);
 	if (bytes == NULL) {
 		filename = g_file_get_path (file);
diff --git a/libappstream-glib/as-utils.c b/libappstream-glib/as-utils.c
index a3317fe..c959677 100644
--- a/libappstream-glib/as-utils.c
+++ b/libappstream-glib/as-utils.c
@@ -1626,9 +1626,9 @@ as_utils_string_replace (GString *string, const gchar *search, const gchar *repl
 {
 	gchar *tmp;
 	guint count = 0;
-	guint search_idx = 0;
-	guint replace_len;
-	guint search_len;
+	gsize search_idx = 0;
+	gsize replace_len;
+	gsize search_len;
 
 	g_return_val_if_fail (string != NULL, 0);
 	g_return_val_if_fail (search != NULL, 0);
@@ -1638,8 +1638,8 @@ as_utils_string_replace (GString *string, const gchar *search, const gchar *repl
 	if (string->len == 0)
 		return 0;
 
-	search_len = (guint) strlen (search);
-	replace_len = (guint) strlen (replace);
+	search_len = strlen (search);
+	replace_len = strlen (replace);
 
 	do {
 		tmp = g_strstr_len (string->str + search_idx, -1, search);
@@ -1647,16 +1647,19 @@ as_utils_string_replace (GString *string, const gchar *search, const gchar *repl
 			break;
 
 		/* advance the counter in case @replace contains @search */
-		search_idx = (guint) (tmp - string->str);
+		search_idx = (gsize) (tmp - string->str);
 
 		/* reallocate the string if required */
 		if (search_len > replace_len) {
-			g_string_erase (string, search_idx,
-					search_len - replace_len);
+			g_string_erase (string,
+					(gssize) search_idx,
+					(gssize) (search_len - replace_len));
 			memcpy (tmp, replace, replace_len);
 		} else if (search_len < replace_len) {
-			g_string_insert_len (string, search_idx, replace,
-					     replace_len - search_len);
+			g_string_insert_len (string,
+					     (gssize) search_idx,
+					     replace,
+					     (gssize) (replace_len - search_len));
 			/* we have to treat this specially as it could have
 			 * been reallocated when the insertion happened */
 			memcpy (string->str + search_idx, replace, replace_len);
diff --git a/libappstream-glib/as-yaml.c b/libappstream-glib/as-yaml.c
index 2bebbec..77946b6 100644
--- a/libappstream-glib/as-yaml.c
+++ b/libappstream-glib/as-yaml.c
@@ -406,7 +406,7 @@ as_yaml_from_data (const gchar *data, gssize data_len, GError **error)
 	}
 	parser_cleanup = &parser;
 	if (data_len < 0)
-		data_len = (guint) strlen (data);
+		data_len = (gssize) strlen (data);
 	yaml_parser_set_input_string (&parser, (guchar *) data, (gsize) data_len);
 	node = g_node_new (NULL);
 	if (!as_node_yaml_process_layer (&parser, node, error))