diff options
author | Daniele Nicolodi <daniele@grinta.net> | 2021-05-02 11:11:01 +0200 |
---|---|---|
committer | Daniele Nicolodi <daniele@grinta.net> | 2021-05-08 18:24:31 +0200 |
commit | 475914cade9a1d3973fe5e7d8c9916092327f464 (patch) | |
tree | 7b598498f4a6ae3e7bd1162587c6687b8fe12a5e /src | |
parent | f02184ee8f00a4008cf9990b16afb13c6ef0da1b (diff) | |
download | tracker-475914cade9a1d3973fe5e7d8c9916092327f464.tar.gz |
treewide: Fix signed vs unsigned comparison in loop index variables
Diffstat (limited to 'src')
-rw-r--r-- | src/libtracker-common/tracker-utils.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-data-manager.c | 4 | ||||
-rw-r--r-- | src/libtracker-data/tracker-data-update.c | 35 | ||||
-rw-r--r-- | src/libtracker-data/tracker-db-interface-sqlite.c | 8 | ||||
-rw-r--r-- | src/libtracker-data/tracker-ontologies.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-sparql-parser.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-sparql-types.c | 6 | ||||
-rw-r--r-- | src/libtracker-data/tracker-sparql.c | 20 | ||||
-rw-r--r-- | src/libtracker-sparql/direct/tracker-direct.c | 4 | ||||
-rw-r--r-- | src/libtracker-sparql/tracker-endpoint-dbus.c | 2 | ||||
-rw-r--r-- | src/libtracker-sparql/tracker-resource.c | 10 | ||||
-rw-r--r-- | src/portal/tracker-portal.c | 4 | ||||
-rw-r--r-- | src/tracker/tracker-main.c | 4 |
13 files changed, 52 insertions, 51 deletions
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c index 3bcb5628f..3c03a79a1 100644 --- a/src/libtracker-common/tracker-utils.c +++ b/src/libtracker-common/tracker-utils.c @@ -261,7 +261,7 @@ tracker_resolve_relative_uri (const gchar *base, gchar **base_split, **rel_split, *host; GPtrArray *base_norm, *rel_norm; GString *str; - gint i; + guint i; /* Relative IRIs are combined with base IRIs with a simplified version * of the algorithm described at RFC3986, Section 5.2. We don't care diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c index ab20adda6..899606e47 100644 --- a/src/libtracker-data/tracker-data-manager.c +++ b/src/libtracker-data/tracker-data-manager.c @@ -1555,7 +1555,7 @@ tracker_data_ontology_process_changes_pre_db (TrackerDataManager *manager, GPtrArray *seen_properties, GError **error) { - gint i; + guint i; if (seen_classes) { for (i = 0; i < seen_classes->len; i++) { GError *n_error = NULL; @@ -1599,7 +1599,7 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager *manager, GPtrArray *seen_properties, GError **error) { - gint i; + guint i; /* TODO: Collect the ontology-paths of the seen events for proper error reporting */ const gchar *ontology_path = "Unknown"; diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c index 7e2233c42..3091c05e8 100644 --- a/src/libtracker-data/tracker-data-update.c +++ b/src/libtracker-data/tracker-data-update.c @@ -544,7 +544,7 @@ static void cache_table_free (TrackerDataUpdateBufferTable *table) { TrackerDataUpdateBufferProperty *property; - gint i; + guint i; for (i = 0; i < table->properties->len; i++) { property = &g_array_index (table->properties, TrackerDataUpdateBufferProperty, i); @@ -820,7 +820,8 @@ tracker_data_resource_buffer_flush (TrackerData *data, TrackerDataUpdateBufferProperty *property; GHashTableIter iter; const gchar *table_name, *database; - gint i, param; + guint i; + gint param; GError *actual_error = NULL; iface = tracker_data_manager_get_writable_db_interface (data->manager); @@ -1080,7 +1081,7 @@ tracker_data_resource_unref_all (TrackerData *data, GError **error) { GArray *old_values; - gint i; + guint i; g_assert (tracker_property_get_multiple_values (property) == TRUE); g_assert (tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_RESOURCE); @@ -1223,7 +1224,7 @@ tracker_data_update_buffer_flush (TrackerData *data, TrackerDataUpdateBufferResource *resource; GHashTableIter iter; GError *actual_error = NULL; - gint i; + guint i; for (i = 0; i < data->update_buffer.graphs->len; i++) { graph = g_ptr_array_index (data->update_buffer.graphs, i); @@ -1255,7 +1256,7 @@ tracker_data_update_buffer_might_flush (TrackerData *data, GError **error) { TrackerDataUpdateBufferGraph *graph; - gint i, count = 0; + guint i, count = 0; for (i = 0; i < data->update_buffer.graphs->len; i++) { graph = g_ptr_array_index (data->update_buffer.graphs, i); @@ -1285,7 +1286,8 @@ cache_create_service_decomposed (TrackerData *data, TrackerClass **super_classes; TrackerProperty **domain_indexes; GValue gvalue = { 0 }; - gint i, class_id; + guint i; + gint class_id; TrackerOntologies *ontologies; /* also create instance of all super classes */ @@ -1407,7 +1409,7 @@ value_set_add_value (GArray *value_set, GValue *value) { GValue gvalue_copy = { 0 }; - gint i; + guint i; g_return_val_if_fail (G_VALUE_TYPE (value), FALSE); @@ -1432,7 +1434,7 @@ static gboolean value_set_remove_value (GArray *value_set, GValue *value) { - gint i; + guint i; g_return_val_if_fail (G_VALUE_TYPE (value), FALSE); @@ -1455,7 +1457,7 @@ static gboolean check_property_domain (TrackerData *data, TrackerProperty *property) { - gint type_index; + guint type_index; for (type_index = 0; type_index < data->resource_buffer->types->len; type_index++) { if (tracker_property_get_domain (property) == g_ptr_array_index (data->resource_buffer->types, type_index)) { @@ -1604,7 +1606,7 @@ get_old_property_values (TrackerData *data, && check_property_domain (data, prop)) { const gchar *property_name; GString *str; - gint i; + guint j; old_values = get_property_values (data, prop, error); if (!old_values) { @@ -1617,9 +1619,9 @@ get_old_property_values (TrackerData *data, str = g_string_new (NULL); /* delete old fts entries */ - for (i = 0; i < old_values->len; i++) { - GValue *value = &g_array_index (old_values, GValue, i); - if (i != 0) + for (j = 0; j < old_values->len; j++) { + GValue *value = &g_array_index (old_values, GValue, j); + if (j != 0) g_string_append_c (str, ','); g_string_append (str, g_value_get_string (value)); } @@ -2074,8 +2076,7 @@ cache_delete_resource_type_full (TrackerData *data, TrackerDBCursor *cursor = NULL; TrackerProperty **properties, *prop; gboolean found; - gint i; - guint p, n_props; + guint i, p, n_props; GError *inner_error = NULL; TrackerOntologies *ontologies; const gchar *database; @@ -2248,7 +2249,7 @@ ensure_graph_buffer (TrackerDataUpdateBuffer *buffer, GError **error) { TrackerDataUpdateBufferGraph *graph_buffer; - gint i; + guint i; for (i = 0; i < buffer->graphs->len; i++) { graph_buffer = g_ptr_array_index (buffer->graphs, i); @@ -2442,7 +2443,7 @@ delete_all_helper (TrackerData *data, TrackerProperty **super_properties; GArray *super_old_values; GValue *value; - gint i; + guint i; if (subproperty == property) { if (tracker_property_get_multiple_values (property)) { diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c index 8e97f37f0..a551393a9 100644 --- a/src/libtracker-data/tracker-db-interface-sqlite.c +++ b/src/libtracker-data/tracker-db-interface-sqlite.c @@ -1964,7 +1964,7 @@ check_interrupt (void *user_data) static void initialize_functions (TrackerDBInterface *db_interface) { - gint i; + gsize i; struct { gchar *name; int n_args; @@ -3161,7 +3161,7 @@ static void tracker_db_cursor_finalize (GObject *object) { TrackerDBCursor *cursor; - int i; + guint i; cursor = TRACKER_DB_CURSOR (object); @@ -3297,7 +3297,7 @@ tracker_db_cursor_sqlite_new (TrackerDBStatement *ref_stmt, cursor->ref_stmt = tracker_db_statement_sqlite_grab (ref_stmt); if (types) { - gint i; + guint i; cursor->types = g_new (TrackerPropertyType, n_types); cursor->n_types = n_types; @@ -3307,7 +3307,7 @@ tracker_db_cursor_sqlite_new (TrackerDBStatement *ref_stmt, } if (variable_names) { - gint i; + guint i; cursor->variable_names = g_new (gchar *, n_variable_names); cursor->n_variable_names = n_variable_names; diff --git a/src/libtracker-data/tracker-ontologies.c b/src/libtracker-data/tracker-ontologies.c index eaef8bc1e..ed97bf648 100644 --- a/src/libtracker-data/tracker-ontologies.c +++ b/src/libtracker-data/tracker-ontologies.c @@ -531,7 +531,7 @@ tracker_ontologies_write_gvdb (TrackerOntologies *ontologies, const gchar *uri; gboolean retval; gchar *str; - gint i; + guint i; root_table = gvdb_hash_table_new (NULL, NULL); diff --git a/src/libtracker-data/tracker-sparql-parser.c b/src/libtracker-data/tracker-sparql-parser.c index 939022fa5..70872c321 100644 --- a/src/libtracker-data/tracker-sparql-parser.c +++ b/src/libtracker-data/tracker-sparql-parser.c @@ -743,7 +743,7 @@ tracker_parser_state_propagate_error (TrackerGrammarParser *parser, rule = g_ptr_array_index (state->error_rules, 0); append_rule (str, rule); } else { - gint i; + guint i; g_string_append (str, "one of "); repeated = g_hash_table_new (rule_hash, rule_equals); diff --git a/src/libtracker-data/tracker-sparql-types.c b/src/libtracker-data/tracker-sparql-types.c index a638620b2..d9ac2b5f4 100644 --- a/src/libtracker-data/tracker-sparql-types.c +++ b/src/libtracker-data/tracker-sparql-types.c @@ -296,12 +296,12 @@ GHashTable * tracker_solution_get_bindings (TrackerSolution *solution) { GHashTable *ht; - gint i; + guint i; ht = g_hash_table_new (g_str_hash, g_str_equal); for (i = 0; i < solution->columns->len; i++) { - gint values_pos = solution->solution_index * solution->n_cols + i; + guint values_pos = solution->solution_index * solution->n_cols + i; gchar *name, *value; if (values_pos >= solution->values->len) @@ -809,7 +809,7 @@ void tracker_select_context_add_literal_binding (TrackerSelectContext *context, TrackerLiteralBinding *binding) { - gint i; + guint i; /* Literal bindings are reserved to the root context */ g_assert (TRACKER_CONTEXT (context)->parent == NULL); diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c index 08a7a7cee..332b295cb 100644 --- a/src/libtracker-data/tracker-sparql.c +++ b/src/libtracker-data/tracker-sparql.c @@ -628,7 +628,7 @@ static gboolean tracker_sparql_graph_is_whitelisted (TrackerSparql *sparql, const gchar *graph) { - gint i; + guint i; if (!sparql->policy.graphs) return TRUE; @@ -657,7 +657,7 @@ tracker_sparql_get_effective_graphs (TrackerSparql *sparql) if (graphs && sparql->policy.graphs) { if (!sparql->policy.filtered_graphs) { - gint i; + guint i; sparql->policy.filtered_graphs = g_hash_table_new_full (g_str_hash, @@ -1651,7 +1651,7 @@ _add_quad (TrackerSparql *sparql, if (binding_list) { TrackerClass *domain_index = NULL; TrackerClass **classes; - gint i = 0, j; + guint i = 0, j; classes = tracker_property_get_domain_indexes (property); @@ -2244,7 +2244,7 @@ _end_triples_block (TrackerSparql *sparql, TrackerContext *context; GHashTableIter iter; gboolean first = TRUE; - gint i; + guint i; context = sparql->current_state->context; g_assert (TRACKER_IS_TRIPLE_CONTEXT (context)); @@ -2858,7 +2858,7 @@ intersect_set (GPtrArray *array, GPtrArray *set) { const gchar *set_graph, *graph; - gint i = 0, j; + guint i = 0, j; gboolean found; while (i < array->len) { @@ -5287,7 +5287,7 @@ translate_ServiceGraphPattern (TrackerSparql *sparql, if (sparql->policy.services && tracker_token_get_literal (&service)) { gboolean found = FALSE; - gint i; + guint i; for (i = 0; i < sparql->policy.services->len; i++) { if (g_strcmp0 (g_ptr_array_index (sparql->policy.services, i), @@ -5872,7 +5872,7 @@ translate_GroupOrUnionGraphPattern (TrackerSparql *sparql, TrackerContext *context; GPtrArray *placeholders; GList *vars, *c; - gint idx = 0; + guint idx = 0; gboolean do_join; /* GroupOrUnionGraphPattern ::= GroupGraphPattern ( 'UNION' GroupGraphPattern )* @@ -6424,7 +6424,7 @@ translate_PathAlternative (TrackerSparql *sparql, if (path_elems->len > 1) { TrackerPathElement *path_elem; - gint i; + guint i; path_elem = tracker_path_element_operator_new (TRACKER_PATH_OPERATOR_ALTERNATIVE, tracker_token_get_idstring (&sparql->current_state->graph), @@ -6661,7 +6661,7 @@ translate_PathNegatedPropertySet (TrackerSparql *sparql, } if (path_elems->len > 1) { - gint i; + guint i; path_elem = tracker_path_element_operator_new (TRACKER_PATH_OPERATOR_INTERSECTION, tracker_token_get_idstring (&sparql->current_state->graph), @@ -6890,7 +6890,7 @@ translate_Collection (TrackerSparql *sparql, { TrackerToken old_subject, old_predicate, old_object, *old_token, *cur; GArray *elems; - gint i; + guint i; /* Collection ::= '(' GraphNode+ ')' */ diff --git a/src/libtracker-sparql/direct/tracker-direct.c b/src/libtracker-sparql/direct/tracker-direct.c index 7f5131deb..12e6b1db7 100644 --- a/src/libtracker-sparql/direct/tracker-direct.c +++ b/src/libtracker-sparql/direct/tracker-direct.c @@ -503,7 +503,7 @@ insert_statement_cb (gint graph_id, TrackerProperty *rdf_type = tracker_ontologies_get_rdf_type (ontologies); TrackerNotifierEventCache *cache; TrackerClass *new_class = NULL; - gint i; + guint i; cache = lookup_event_cache (notifier, graph_id, graph); @@ -549,7 +549,7 @@ delete_statement_cb (gint graph_id, TrackerProperty *rdf_type = tracker_ontologies_get_rdf_type (ontologies); TrackerNotifierEventCache *cache; TrackerClass *class_being_removed = NULL; - gint i; + guint i; cache = lookup_event_cache (notifier, graph_id, graph); diff --git a/src/libtracker-sparql/tracker-endpoint-dbus.c b/src/libtracker-sparql/tracker-endpoint-dbus.c index fb3d8b7bc..f204ed37b 100644 --- a/src/libtracker-sparql/tracker-endpoint-dbus.c +++ b/src/libtracker-sparql/tracker-endpoint-dbus.c @@ -725,7 +725,7 @@ notifier_events_cb (TrackerNotifier *notifier, TrackerEndpointDBus *endpoint_dbus = user_data; GVariantBuilder builder; GError *error = NULL; - gint i; + guint i; if (tracker_endpoint_dbus_filter_graph (endpoint_dbus, graph)) return; diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c index 2b22884b6..265bea835 100644 --- a/src/libtracker-sparql/tracker-resource.c +++ b/src/libtracker-sparql/tracker-resource.c @@ -698,7 +698,7 @@ GList *tracker_resource_get_values (TrackerResource *self, if (G_VALUE_HOLDS (value, G_TYPE_PTR_ARRAY)) { GList *result = NULL; GPtrArray *array; - int i; + guint i; array = g_value_get_boxed (value); @@ -1088,7 +1088,7 @@ generate_turtle_resources_foreach (gpointer key, const GValue *value = value_ptr; GenerateTurtleData *data = user_data; TrackerResource *resource; - int i; + guint i; if (G_VALUE_HOLDS (value, TRACKER_TYPE_RESOURCE)) { resource = g_value_get_object (value); @@ -1211,7 +1211,7 @@ generate_turtle_property (const char *property, g_string_append (string, " "); if (G_VALUE_HOLDS (value, G_TYPE_PTR_ARRAY)) { - int i; + guint i; GPtrArray *array = g_value_get_boxed (value); if (array->len > 0) { generate_turtle_value (g_ptr_array_index (array, 0), @@ -1340,7 +1340,7 @@ generate_sparql_relation_deletes_foreach (gpointer key, { const GValue *value = value_ptr; GenerateSparqlData *data = user_data; - int i; + guint i; if (G_VALUE_HOLDS (value, TRACKER_TYPE_RESOURCE)) { TrackerResource *relation = g_value_get_object (value); @@ -1382,7 +1382,7 @@ generate_sparql_relation_inserts_foreach (gpointer key, GPtrArray *array = g_value_get_boxed (value); const GValue *array_value; TrackerResource *relation; - gint i; + guint i; for (i = 0; i < array->len; i++) { array_value = g_ptr_array_index (array, i); diff --git a/src/portal/tracker-portal.c b/src/portal/tracker-portal.c index d2590475a..2da9adaeb 100644 --- a/src/portal/tracker-portal.c +++ b/src/portal/tracker-portal.c @@ -192,7 +192,7 @@ endpoint_closed_cb (TrackerPortalEndpoint *endpoint, gpointer user_data) { TrackerPortal *portal = user_data; - gint i; + guint i; for (i = 0; i < portal->sessions->len; i++) { TrackerSession *session; @@ -370,7 +370,7 @@ portal_iface_method_call (GDBusConnection *connection, } else if (g_strcmp0 (method_name, "CloseSession") == 0) { g_autofree gchar *object_path = NULL; gboolean found = FALSE; - gint i; + guint i; g_variant_get (parameters, "(o)", &object_path); g_debug ("Got request for closing session '%s'", object_path); diff --git a/src/tracker/tracker-main.c b/src/tracker/tracker-main.c index ebe4ce4af..b11b0657c 100644 --- a/src/tracker/tracker-main.c +++ b/src/tracker/tracker-main.c @@ -121,7 +121,7 @@ static void handle_command (int argc, const char **argv) { char *cmd = g_path_get_basename (argv[0]); - int i; + guint i; for (i = 0; i < G_N_ELEMENTS (commands); i++) { struct cmd_struct *p = commands + i; @@ -151,7 +151,7 @@ mput_char (char c, unsigned int num) static void print_usage_list_cmds (void) { - int i, longest = 0; + guint i, longest = 0; GList *extra_commands = NULL; GFileEnumerator *enumerator; GFileInfo *info; |