GNOME.org
 

[anjuta] symbol-db: fix compile warnings

commit 38b5629e1728510dbfcf82e343e7954fb7a89e20
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Thu Feb 14 22:39:40 2013 +0100

    symbol-db: fix compile warnings
    
    Mosly regarding unused variables, invalid function prototypes and
    usage of deprecated thread functions.

 plugins/symbol-db/benchmark/libgda/libgda.c       |    7 +----
 plugins/symbol-db/benchmark/sqlite/sqlite.c       |    9 +-----
 plugins/symbol-db/benchmark/symbol-db/benchmark.c |    1 -
 plugins/symbol-db/plugin.c                        |   11 +-------
 plugins/symbol-db/plugin.h                        |    4 +-
 plugins/symbol-db/symbol-db-engine-core.c         |   26 +++++++++-----------
 plugins/symbol-db/symbol-db-engine-core.h         |    6 ++--
 plugins/symbol-db/symbol-db-engine-priv.h         |    6 ++--
 plugins/symbol-db/symbol-db-engine-utils.c        |   16 +++++--------
 plugins/symbol-db/symbol-db-model.c               |   19 +++------------
 plugins/symbol-db/symbol-db-system.c              |   10 --------
 plugins/symbol-db/symbol-db-system.h              |    2 +-
 12 files changed, 37 insertions(+), 80 deletions(-)
---
diff --git a/plugins/symbol-db/benchmark/libgda/libgda.c b/plugins/symbol-db/benchmark/libgda/libgda.c
index a4c56f0..450488f 100644
--- a/plugins/symbol-db/benchmark/libgda/libgda.c
+++ b/plugins/symbol-db/benchmark/libgda/libgda.c
@@ -97,7 +97,7 @@ get_select_statement_by_query_id (GdaConnection * cnc, GdaSet **plist)
 }
 
 static void 
-load_queue_values ()
+load_queue_values (void)
 {
        gchar line[80];
        values_queue = g_queue_new ();
@@ -114,7 +114,7 @@ load_queue_values ()
 }
 
 static void
-delete_previous_db ()
+delete_previous_db (void)
 {
        GFile *file;
 
@@ -132,9 +132,6 @@ delete_previous_db ()
 int
 main (int argc, char *argv[])
 {
-       if ( !g_thread_supported() )
-               g_thread_init( NULL );
-
        g_type_init();
        gtk_init(&argc, &argv);
        
diff --git a/plugins/symbol-db/benchmark/sqlite/sqlite.c b/plugins/symbol-db/benchmark/sqlite/sqlite.c
index 18fe4c1..b425b34 100644
--- a/plugins/symbol-db/benchmark/sqlite/sqlite.c
+++ b/plugins/symbol-db/benchmark/sqlite/sqlite.c
@@ -23,7 +23,7 @@ create_table (sqlite3 *db)
 }
 
 static void
-delete_previous_db ()
+delete_previous_db (void)
 {
        GFile *file;
 
@@ -54,7 +54,7 @@ open_connection (sqlite3 **db)
 }
 
 static void 
-load_queue_values ()
+load_queue_values (void)
 {
        gchar line[80];
        values_queue = g_queue_new ();
@@ -150,13 +150,8 @@ main(gint argc, gchar **argv)
 {
        sqlite3 *db = NULL;
 
-
-       if ( !g_thread_supported() )
-               g_thread_init( NULL );
-
        g_type_init();
 
-       
        delete_previous_db ();
 
        if (open_connection (&db) < 0)
diff --git a/plugins/symbol-db/benchmark/symbol-db/benchmark.c 
b/plugins/symbol-db/benchmark/symbol-db/benchmark.c
index a5b3059..536dbea 100644
--- a/plugins/symbol-db/benchmark/symbol-db/benchmark.c
+++ b/plugins/symbol-db/benchmark/symbol-db/benchmark.c
@@ -89,7 +89,6 @@ int main (int argc, char** argv)
        main_loop = g_main_loop_new (NULL, FALSE);
 
        gtk_init(&argc, &argv);
-       g_thread_init (NULL);
        gda_init ();
        
        if (argc != 2)
diff --git a/plugins/symbol-db/plugin.c b/plugins/symbol-db/plugin.c
index 087c964..cad5e6d 100644
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@ -1406,8 +1406,8 @@ do_check_offline_files_changed (SymbolDBPlugin *sdb_plugin)
                
                if (db_path)
                        g_hash_table_replace (prj_elements_hash,
-                                             db_path,
-                                             filename);
+                                             (gchar *)db_path,
+                                             (gchar *)filename);
                g_object_unref (gfile);
        }       
 
@@ -1622,12 +1622,10 @@ static void
 on_project_root_added (AnjutaPlugin *plugin, const gchar *name,
                                        const GValue *value, gpointer user_data)
 {
-       IAnjutaProjectManager *pm;
        SymbolDBPlugin *sdb_plugin;
        const gchar *root_uri;
        gchar *root_dir;
        GFile *gfile;
-       IAnjutaProject *project;
        
        sdb_plugin = ANJUTA_PLUGIN_SYMBOL_DB (plugin);
 
@@ -1661,9 +1659,6 @@ on_project_root_added (AnjutaPlugin *plugin, const gchar *name,
         * if the preferences says not to automatically scan the packages.
         */
        gtk_widget_hide (sdb_plugin->progress_bar_system);
-       
-       pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell,
-                                                                        IAnjutaProjectManager, NULL);
 
 
        /*
@@ -1687,8 +1682,6 @@ on_project_root_added (AnjutaPlugin *plugin, const gchar *name,
                
        g_object_unref (gfile);
 
-       project = ianjuta_project_manager_get_current_project (pm, NULL);
-
        /* let the project be something like "." to avoid problems when renaming the 
         * project dir */
        sdb_plugin->project_opened = g_strdup (PROJECT_ROOT_NAME_DEFAULT);
diff --git a/plugins/symbol-db/plugin.h b/plugins/symbol-db/plugin.h
index 6451ee9..dc51fc7 100644
--- a/plugins/symbol-db/plugin.h
+++ b/plugins/symbol-db/plugin.h
@@ -157,8 +157,8 @@ struct _SymbolDBPluginClass {
        AnjutaPluginClass parent_class;
        
        /* signals */
-       void (* project_import_end)     ();
-       void (* globals_import_end)     ();
+       void (* project_import_end)     (void);
+       void (* globals_import_end)     (void);
        
 };
 
diff --git a/plugins/symbol-db/symbol-db-engine-core.c b/plugins/symbol-db/symbol-db-engine-core.c
index 1c76ef2..881c74a 100644
--- a/plugins/symbol-db/symbol-db-engine-core.c
+++ b/plugins/symbol-db/symbol-db-engine-core.c
@@ -1487,8 +1487,8 @@ static gint sdb_sort_files_list (gconstpointer file1, gconstpointer file2)
  *
  */
 static gboolean
-sdb_engine_scan_files_1 (SymbolDBEngine * dbe, const GPtrArray * files_list,
-                                                GPtrArray *real_files_list, gboolean symbols_update,
+sdb_engine_scan_files_1 (SymbolDBEngine * dbe, GPtrArray * files_list,
+                         GPtrArray *real_files_list, gboolean symbols_update,
                          gint scan_id)
 {
        SymbolDBEnginePriv *priv;
@@ -1621,9 +1621,9 @@ on_scan_files_async_end (SymbolDBEngine *dbe, gint process_id, gpointer user_dat
 }
 
 static gboolean
-sdb_engine_scan_files_async (SymbolDBEngine * dbe, const GPtrArray * files_list,
-                                                       const GPtrArray *real_files_list, gboolean 
symbols_update,
-                            gint scan_id)
+sdb_engine_scan_files_async (SymbolDBEngine * dbe, GPtrArray * files_list,
+                             GPtrArray *real_files_list, gboolean symbols_update,
+                             gint scan_id)
 {
        SymbolDBEnginePriv *priv;
        g_return_val_if_fail (files_list != NULL, FALSE);
@@ -1782,7 +1782,10 @@ sdb_engine_init (SymbolDBEngine * object)
        sdbe->priv->thread_pool = g_thread_pool_new (sdb_engine_ctags_output_thread,
                                                                                                 sdbe, 
THREADS_MAX_CONCURRENT,
                                                                                                 FALSE, NULL);
-       
+
+       /* initialize the sdb mutex */
+       g_mutex_init (&sdbe->priv->mutex);
+
        /* some signals queues */
        sdbe->priv->signals_aqueue = g_async_queue_new ();
        sdbe->priv->updated_syms_id_aqueue = g_async_queue_new ();
@@ -2098,13 +2101,9 @@ sdb_engine_finalize (GObject * object)
                g_list_free (priv->removed_launchers);
                priv->removed_launchers = NULL;
        }
-       
-       if (priv->mutex)
-       {
-               g_mutex_free (priv->mutex);
-               priv->mutex = NULL;
-       }
-       
+
+       g_mutex_clear (&priv->mutex);
+
        if (priv->timeout_trigger_handler > 0)
                g_source_remove (priv->timeout_trigger_handler);
 
@@ -2380,7 +2379,6 @@ symbol_db_engine_new (const gchar * ctags_path)
        sdbe = g_object_new (SYMBOL_TYPE_DB_ENGINE, NULL);
        
        priv = sdbe->priv;
-       priv->mutex = g_mutex_new ();
        priv->anjuta_db_file = g_strdup (ANJUTA_DB_FILE);
 
        /* set the mandatory ctags_path */
diff --git a/plugins/symbol-db/symbol-db-engine-core.h b/plugins/symbol-db/symbol-db-engine-core.h
index 1ec96f4..cfe4f78 100644
--- a/plugins/symbol-db/symbol-db-engine-core.h
+++ b/plugins/symbol-db/symbol-db-engine-core.h
@@ -51,10 +51,10 @@ struct _SymbolDBEngineClass
        GObjectClass parent_class;
        
        /* signals */
-       void (* db_connected)           ();
-       void (* db_disconnected)        ();
+       void (* db_connected)           (void);
+       void (* db_disconnected)        (void);
        void (* scan_begin)             (gint process_id);
-       void (* single_file_scan_end)   ();
+       void (* single_file_scan_end)   (void);
        void (* scan_end)                               (gint process_id);
        void (* symbol_inserted)                (gint symbol_id);
        void (* symbol_updated)                 (gint symbol_id);
diff --git a/plugins/symbol-db/symbol-db-engine-priv.h b/plugins/symbol-db/symbol-db-engine-priv.h
index fee3e5c..85b118b 100644
--- a/plugins/symbol-db/symbol-db-engine-priv.h
+++ b/plugins/symbol-db/symbol-db-engine-priv.h
@@ -100,8 +100,8 @@
        gda_holder_set_value ((gda_param), &v, NULL); \
        g_value_unset (&v);
 
-#define SDB_LOCK(priv) if (priv->mutex) g_mutex_lock (priv->mutex);
-#define SDB_UNLOCK(priv) if (priv->mutex) g_mutex_unlock (priv->mutex);
+#define SDB_LOCK(priv) g_mutex_lock (&priv->mutex);
+#define SDB_UNLOCK(priv) g_mutex_unlock (&priv->mutex);
 
 typedef enum
 {
@@ -196,7 +196,7 @@ struct _SymbolDBEnginePriv
        gulong waiting_scan_handler;
 
        /* Threads management */
-       GMutex* mutex;
+       GMutex mutex;
        GAsyncQueue* signals_aqueue;
        
        GThreadPool *thread_pool;       
diff --git a/plugins/symbol-db/symbol-db-engine-utils.c b/plugins/symbol-db/symbol-db-engine-utils.c
index 3d0e2c0..999dd5d 100644
--- a/plugins/symbol-db/symbol-db-engine-utils.c
+++ b/plugins/symbol-db/symbol-db-engine-utils.c
@@ -97,15 +97,13 @@ symbol_db_util_get_files_with_zero_symbols (SymbolDBEngine *dbe)
        g_return_val_if_fail (dbe != NULL, NULL);
        priv = dbe->priv;
 
-       if (priv->mutex)
-               g_mutex_lock (priv->mutex);     
+       SDB_LOCK(priv);
 
        if ((stmt = sdb_engine_get_statement_by_query_id (dbe,
                                                                 
PREP_QUERY_GET_ALL_FROM_FILE_WHERE_NOT_IN_SYMBOLS))
                == NULL)
        {
-               if (priv->mutex)
-                       g_mutex_unlock (priv->mutex);
+               SDB_UNLOCK(priv);
                return NULL;
        }
 
@@ -118,8 +116,7 @@ symbol_db_util_get_files_with_zero_symbols (SymbolDBEngine *dbe)
        {
                if (data_model != NULL)
                        g_object_unref (data_model);
-               if (priv->mutex)
-                       g_mutex_unlock (priv->mutex);
+               SDB_UNLOCK(priv);
                return NULL;
        }       
                
@@ -148,9 +145,8 @@ symbol_db_util_get_files_with_zero_symbols (SymbolDBEngine *dbe)
        }
 
        g_object_unref (data_model);
-       
-       if (priv->mutex)
-               g_mutex_unlock (priv->mutex);
+
+       SDB_UNLOCK(priv);
        
        return files_to_scan;
 }
@@ -163,7 +159,7 @@ symbol_db_util_get_files_with_zero_symbols (SymbolDBEngine *dbe)
        g_free (pix_file);
 
 static void
-sdb_util_load_symbol_pixbufs ()
+sdb_util_load_symbol_pixbufs (void)
 {
        gchar *pix_file;
        
diff --git a/plugins/symbol-db/symbol-db-model.c b/plugins/symbol-db/symbol-db-model.c
index 3678b28..164e9ff 100644
--- a/plugins/symbol-db/symbol-db-model.c
+++ b/plugins/symbol-db/symbol-db-model.c
@@ -667,13 +667,11 @@ sdb_model_get_path (GtkTreeModel *tree_model,
 {
        SymbolDBModelNode *node;
        GtkTreePath* path;
-       SymbolDBModelPriv *priv;
        gint offset;
        
        g_return_val_if_fail (sdb_model_iter_is_valid (tree_model, iter),
                              NULL);
 
-       priv = SYMBOL_DB_MODEL (tree_model)->priv;
        path = gtk_tree_path_new ();
 
        node = (SymbolDBModelNode*)iter->user_data;
@@ -694,7 +692,6 @@ sdb_model_get_value (GtkTreeModel *tree_model,
 {
        SymbolDBModelPriv *priv;
        SymbolDBModelNode *parent_node, *node;
-       SymbolDBModelPage *page;
        gint offset;
        
        g_return_if_fail (sdb_model_iter_is_valid (tree_model, iter));
@@ -708,8 +705,8 @@ sdb_model_get_value (GtkTreeModel *tree_model,
        offset = GPOINTER_TO_INT (iter->user_data2);
 
        if (sdb_model_node_get_child (parent_node, offset) == NULL)
-               page = sdb_model_page_fault (SYMBOL_DB_MODEL (tree_model),
-                                            parent_node, offset);
+               sdb_model_page_fault (SYMBOL_DB_MODEL (tree_model),
+                                     parent_node, offset);
        node = sdb_model_node_get_child (parent_node, offset);
        g_value_init (value, priv->column_types[column]);
 
@@ -868,8 +865,7 @@ sdb_model_iter_nth_child (GtkTreeModel *tree_model,
                           gint n)
 {
        SymbolDBModelNode *node;
-       SymbolDBModelPriv *priv;
-                                  
+
        g_return_val_if_fail (SYMBOL_DB_IS_MODEL(tree_model), FALSE);
        g_return_val_if_fail (iter != NULL, FALSE);
        g_return_val_if_fail (n >= 0, FALSE);
@@ -877,7 +873,6 @@ sdb_model_iter_nth_child (GtkTreeModel *tree_model,
        if (!sdb_model_iter_children (tree_model, iter, parent))
                return FALSE;
        
-       priv = SYMBOL_DB_MODEL (tree_model)->priv;
        node = (SymbolDBModelNode*) (iter->user_data);
 
        g_return_val_if_fail (n < node->n_children, FALSE);
@@ -917,12 +912,10 @@ static void
 sdb_model_iter_ref (GtkTreeModel *tree_model, GtkTreeIter  *iter)
 {
        SymbolDBModelNode *parent_node;
-       gint child_offset;
-       
+
        g_return_if_fail (sdb_model_iter_is_valid (tree_model, iter));
 
        parent_node = (SymbolDBModelNode*) iter->user_data;
-       child_offset = GPOINTER_TO_INT (iter->user_data2);
 
        sdb_model_node_ref_child (parent_node);
 }
@@ -1044,10 +1037,6 @@ sdb_model_update_node_children (SymbolDBModel *model,
                                 SymbolDBModelNode *node,
                                 gboolean emit_has_child)
 {
-       SymbolDBModelPriv *priv;
-
-       priv = model->priv;
-       
        /* Delete all nodes */
        if (node->n_children > 0)
        {
diff --git a/plugins/symbol-db/symbol-db-system.c b/plugins/symbol-db/symbol-db-system.c
index 291b885..8c21bc7 100644
--- a/plugins/symbol-db/symbol-db-system.c
+++ b/plugins/symbol-db/symbol-db-system.c
@@ -311,8 +311,6 @@ on_pkg_config_output (AnjutaLauncher * launcher,
                                        AnjutaLauncherOutputType output_type,
                                        const gchar * chars, gpointer user_data)
 {
-       SymbolDBSystem *sdbs;
-       SymbolDBSystemPriv *priv;
        SingleScanData *ss_data;
 
        if (output_type == ANJUTA_LAUNCHER_OUTPUT_STDERR)
@@ -322,8 +320,6 @@ on_pkg_config_output (AnjutaLauncher * launcher,
        }
        
        ss_data = (SingleScanData *)user_data;
-       sdbs = ss_data->sdbs;
-       priv = sdbs->priv;
 
        if (ss_data->contents != NULL) 
        {
@@ -721,13 +717,10 @@ symbol_db_system_scan_package (SymbolDBSystem *sdbs,
                                                          const gchar * package_name)
 {
        SingleScanData *ss_data;
-       SymbolDBSystemPriv *priv;
        
        g_return_val_if_fail (sdbs != NULL, FALSE);
        g_return_val_if_fail (package_name != NULL, FALSE);
 
-       priv = sdbs->priv;
-       
        /* does is already exist on db? */
        if (symbol_db_system_is_package_parsed (sdbs, package_name, "1.0") == TRUE)
        {
@@ -764,13 +757,10 @@ symbol_db_system_is_package_parseable (SymbolDBSystem *sdbs,
                                                                   gpointer user_data)
 {
        SingleScanData *ss_data;
-       SymbolDBSystemPriv *priv;
        
        g_return_if_fail (sdbs != NULL);
        g_return_if_fail (package_name != NULL);
 
-       priv = sdbs->priv;
-
        /* create the object to store in the queue */
        ss_data = (SingleScanData*)g_new0 (SingleScanData, 1);
        
diff --git a/plugins/symbol-db/symbol-db-system.h b/plugins/symbol-db/symbol-db-system.h
index ab457e9..62b5718 100644
--- a/plugins/symbol-db/symbol-db-system.h
+++ b/plugins/symbol-db/symbol-db-system.h
@@ -49,7 +49,7 @@ struct _SymbolDBSystemClass
        GObjectClass parent_class;
        
        /* signals */
-       void (* single_file_scan_end)   ();
+       void (* single_file_scan_end)   (void);
        void (* scan_package_start)     (guint num_files, const gchar *package);
        void (* scan_package_end)               (const gchar *package);
 };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]