[tracker] TrackerDecorator: Fix a compilator warning
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] TrackerDecorator: Fix a compilator warning
- Date: Thu, 6 Feb 2014 18:01:30 +0000 (UTC)
commit e0cd92d3a7c02df20a7b0c9813f9c06ef004f345
Author: Xavier Claessens <xavier claessens collabora co uk>
Date: Thu Jan 30 13:59:50 2014 -0500
TrackerDecorator: Fix a compilator warning
gcc was thinking that strings could be used uninitialized.
This fix the warning and simplify the code using a GPtrArray
which is more natural for string arrays.
https://bugzilla.gnome.org/show_bug.cgi?id=719802
src/libtracker-miner/tracker-decorator.c | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
index b45eeb8..1e6d364 100644
--- a/src/libtracker-miner/tracker-decorator.c
+++ b/src/libtracker-miner/tracker-decorator.c
@@ -472,7 +472,7 @@ tracker_decorator_validate_class_ids (TrackerDecorator *decorator,
{
TrackerSparqlConnection *sparql_conn;
TrackerDecoratorPrivate *priv;
- GArray *strings;
+ GPtrArray *strings;
gint i = 0;
priv = decorator->priv;
@@ -489,9 +489,8 @@ tracker_decorator_validate_class_ids (TrackerDecorator *decorator,
g_array_remove_range (priv->class_name_ids, 0,
priv->class_name_ids->len);
+ strings = g_ptr_array_new ();
if (class_names) {
- strings = g_array_new (TRUE, FALSE, sizeof (gchar *));
-
while (class_names[i]) {
gchar *copy;
gint id;
@@ -500,23 +499,17 @@ tracker_decorator_validate_class_ids (TrackerDecorator *decorator,
if (id >= 0) {
copy = g_strdup (class_names[i]);
- g_array_append_val (strings, copy);
+ g_ptr_array_add (strings, copy);
g_array_append_val (priv->class_name_ids, id);
}
i++;
}
}
+ g_ptr_array_add (strings, NULL);
- if (priv->class_names) {
- g_strfreev (priv->class_names);
- priv->class_names = NULL;
- }
-
- if (priv->class_name_ids->len > 0)
- priv->class_names = (GStrv) g_array_free (strings, FALSE);
- else
- g_array_free (strings, TRUE);
+ g_strfreev (priv->class_names);
+ priv->class_names = (GStrv) g_ptr_array_free (strings, FALSE);
g_object_notify (G_OBJECT (decorator), "class-names");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]