[tracker: 11/14] tracker-db-interface: Fix gint vs guint comparisons

[Carlos Garnacho <carlosg src gnome org>]

commit 80830576698b10c5c1cc5685e46003f95e8fc00e
Author: Daniele Nicolodi <daniele grinta net>
Date:   Sun May 2 14:46:54 2021 +0200

    tracker-db-interface: Fix gint vs guint comparisons
    
    Consistently use guint for counting elements in arrays. This changes
    some puplic function parameters from gint to guint, but the type size
    is the same thus the ABI change should not be a concern.

 src/libtracker-data/tracker-db-interface-sqlite.c | 22 +++++++++++-----------
 src/libtracker-data/tracker-db-interface.h        |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index a551393a9..85813d7c9 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -116,9 +116,9 @@ struct TrackerDBCursor {
        TrackerDBStatement *ref_stmt;
        gboolean finished;
        TrackerPropertyType *types;
-       gint n_types;
+       guint n_types;
        gchar **variable_names;
-       gint n_variable_names;
+       guint n_variable_names;
 };
 
 struct TrackerDBCursorClass {
@@ -145,9 +145,9 @@ static TrackerDBStatement *tracker_db_statement_sqlite_new          (TrackerDBIn
 static void                tracker_db_statement_sqlite_reset        (TrackerDBStatement    *stmt);
 static TrackerDBCursor    *tracker_db_cursor_sqlite_new             (TrackerDBStatement    *ref_stmt,
                                                                      TrackerPropertyType   *types,
-                                                                     gint                   n_types,
+                                                                     guint                  n_types,
                                                                      const gchar * const   *variable_names,
-                                                                     gint                   
n_variable_names);
+                                                                     guint                  
n_variable_names);
 static gboolean            tracker_db_cursor_get_boolean            (TrackerSparqlCursor   *cursor,
                                                                      guint                  column);
 static gboolean            db_cursor_iter_next                      (TrackerDBCursor       *cursor,
@@ -612,7 +612,7 @@ function_sparql_time_zone_substr (sqlite3_context *context,
                sqlite3_result_text (context, "", -1, NULL);
        } else if (sqlite3_value_type (argv[0]) == SQLITE_TEXT) {
                const gchar *str;
-               gint len;
+               gsize len;
 
                str = sqlite3_value_text (argv[0]);
                len = strlen (str);
@@ -1750,7 +1750,7 @@ function_sparql_langmatches (sqlite3_context *context,
                /* text arguments don't contain any language information */
                sqlite3_result_int (context, FALSE);
        } else if (type == SQLITE_BLOB) {
-               gint str_len, len;
+               gsize str_len, len;
 
                str = sqlite3_value_blob (argv[0]);
                len = sqlite3_value_bytes (argv[0]);
@@ -3263,9 +3263,9 @@ tracker_db_cursor_class_init (TrackerDBCursorClass *class)
 static TrackerDBCursor *
 tracker_db_cursor_sqlite_new (TrackerDBStatement  *ref_stmt,
                               TrackerPropertyType *types,
-                              gint                 n_types,
+                              guint                n_types,
                               const gchar * const *variable_names,
-                              gint                 n_variable_names)
+                              guint                n_variable_names)
 {
        TrackerDBCursor *cursor;
        TrackerDBInterface *iface;
@@ -3605,7 +3605,7 @@ tracker_db_cursor_get_value_type (TrackerDBCursor *cursor,
 {
        TrackerDBInterface *iface;
        gint column_type;
-       gint n_columns = sqlite3_column_count (cursor->stmt);
+       guint n_columns = sqlite3_column_count (cursor->stmt);
 
        g_return_val_if_fail (column < n_columns, TRACKER_SPARQL_VALUE_TYPE_UNBOUND);
 
@@ -3716,9 +3716,9 @@ tracker_db_statement_start_cursor (TrackerDBStatement  *stmt,
 TrackerDBCursor *
 tracker_db_statement_start_sparql_cursor (TrackerDBStatement   *stmt,
                                           TrackerPropertyType  *types,
-                                          gint                  n_types,
+                                          guint                 n_types,
                                           const gchar * const  *variable_names,
-                                          gint                  n_variable_names,
+                                          guint                 n_variable_names,
                                           GError              **error)
 {
        g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL);
diff --git a/src/libtracker-data/tracker-db-interface.h b/src/libtracker-data/tracker-db-interface.h
index 07f370139..ca651126d 100644
--- a/src/libtracker-data/tracker-db-interface.h
+++ b/src/libtracker-data/tracker-db-interface.h
@@ -144,9 +144,9 @@ TrackerDBCursor *       tracker_db_statement_start_cursor            (TrackerDBS
                                                                       GError                    **error);
 TrackerDBCursor *       tracker_db_statement_start_sparql_cursor     (TrackerDBStatement         *stmt,
                                                                       TrackerPropertyType        *types,
-                                                                      gint                        n_types,
+                                                                      guint                       n_types,
                                                                       const gchar * const        
*variable_names,
-                                                                      gint                        
n_variable_names,
+                                                                      guint                       
n_variable_names,
                                                                       GError                    **error);
 
 /* Functions to deal with a cursor */