anjuta r4441 - in trunk: . plugins/symbol-db

[jhs svn gnome org]

Author: jhs
Date: Fri Dec 12 12:47:05 2008
New Revision: 4441
URL: http://svn.gnome.org/viewvc/anjuta?rev=4441&view=rev

Log:
2008-12-12  Massimo Cora'  <mcora svn gnome org>

	reviewed by: Johannes Schmid <jhs gnome org>

	* plugins/symbol-db/plugin.c
	(on_editor_buffer_symbol_update_scan_end),
	(on_editor_buffer_symbols_update_timeout):
	* plugins/symbol-db/symbol-db-engine.c (sdb_engine_add_new_symbol):
	* plugins/symbol-db/symbol-db-engine.h:
	#562808 â symbol-db crashes with latest libgda

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/plugin.c
   trunk/plugins/symbol-db/symbol-db-engine.c
   trunk/plugins/symbol-db/symbol-db-engine.h
   trunk/plugins/symbol-db/symbol-db-view.c

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Fri Dec 12 12:47:05 2008
@@ -107,7 +107,7 @@
 }
 
 static void
-on_editor_buffer_symbol_update_scan_end (SymbolDBEngine *dbe, gsize process_id, 
+on_editor_buffer_symbol_update_scan_end (SymbolDBEngine *dbe, gint process_id, 
 										  gpointer data)
 {
 	SymbolDBPlugin *sdb_plugin;
@@ -118,7 +118,7 @@
 	/* search for the proc id */
 	for (i = 0; i < sdb_plugin->buffer_update_ids->len; i++)
 	{
-		if (g_ptr_array_index (sdb_plugin->buffer_update_ids, i) == (gpointer)process_id)
+		if (g_ptr_array_index (sdb_plugin->buffer_update_ids, i) == GINT_TO_POINTER (process_id))
 		{
 			gchar *str;
 			/* hey we found it */
@@ -216,7 +216,7 @@
 	g_ptr_array_add (buffer_sizes, (gpointer)buffer_size);	
 
 	
-	gsize proc_id = symbol_db_engine_update_buffer_symbols (sdb_plugin->sdbe_project,
+	gint proc_id = symbol_db_engine_update_buffer_symbols (sdb_plugin->sdbe_project,
 											sdb_plugin->project_opened,
 											real_files_list,
 											text_buffers,

Modified: trunk/plugins/symbol-db/symbol-db-engine.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine.c	Fri Dec 12 12:47:05 2008
@@ -4817,7 +4817,7 @@
 	const gchar* name;
 	gint file_position = 0;
 	gint is_file_scope = 0;
-	gchar signature[256];
+	const gchar *signature;
 	gint scope_definition_id = 0;
 	gint scope_id = 0;
 	gint type_id = 0;
@@ -4851,17 +4851,13 @@
 	file_position = tag_entry->address.lineNumber;
 	is_file_scope = tag_entry->fileScope;
 
-	memset (signature, 0, sizeof (signature));
 	if ((tmp_str = tagsField (tag_entry, "signature")) != NULL)
 	{
-		if (strlen (tmp_str) > sizeof (signature))
-		{
-			memcpy (signature, tmp_str, sizeof (signature));
-		}
-		else
-		{
-			memcpy (signature, tmp_str, strlen (tmp_str));
-		}
+		signature = tmp_str;
+	}
+	else
+	{
+		signature = NULL;
 	}
 	
 	type_id = sdb_engine_add_new_sym_type (dbe, tag_entry);
@@ -5143,7 +5139,7 @@
 		{
 			table_id = -1;
 		}
-	}	
+	}
 
 	
 	/* before returning the table_id we have to fill some infoz on temporary tables

Modified: trunk/plugins/symbol-db/symbol-db-engine.h
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine.h	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine.h	Fri Dec 12 12:47:05 2008
@@ -201,7 +201,7 @@
  * Update symbols of the whole project. It scans all file symbols etc. 
  * If force is true then update forcely all the files.
  */
-gboolean
+gint
 symbol_db_engine_update_project_symbols (SymbolDBEngine *dbe, const gchar *project);
 
 

Modified: trunk/plugins/symbol-db/symbol-db-view.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-view.c	Fri Dec 12 12:47:05 2008
@@ -21,7 +21,7 @@
  * 	51 Franklin Street, Fifth Floor
  * 	Boston, MA  02110-1301, USA.
  */
-
+ 
 #include <glib.h>
 #include <libanjuta/resources.h>
 #include <libanjuta/anjuta-utils.h>