gobject-introspection r730 - in trunk: . girepository giscanner tests/types tools

[tko svn gnome org]

Author: tko
Date: Thu Oct 16 17:07:05 2008
New Revision: 730
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=730&view=rev

Log:
2008-10-16  Tommi Komulainen  <tommi komulainen iki fi>

	Bug 556543 â reduce compiler warnings

	* girepository/ginfo.c:
	* girepository/girepository.c (register_internal,
	count_interfaces, find_interface, find_namespace_version,
	parse_version, g_irepository_require):
	* girepository/girmodule.c (g_ir_module_build_typelib):
	* girepository/girnode.c (init_stats, dump_stats,
	_g_irnode_init_stats, _g_irnode_dump_stats,
	g_ir_node_can_have_member):
	* girepository/girparser.c (firstpass_end_element_handler,
	locate_gir, parse_basic, parse_type_internal, resolve_aliases,
	start_alias, start_type, end_type_top, parse_include, cleanup,
	post_filter):
	* girepository/gtypelib.c (validate_function_blob, validate_enum_blob):
	* giscanner/giscannermodule.c (directive_get_options,
	type_get_child_list):
	* giscanner/scannerlexer.l (parse_gtkdoc):
	* giscanner/scannerparser.y (ctype_free):
	* giscanner/sourcescanner.c:
	* giscanner/sourcescanner.h (gi_source_scanner_parse_macros):
	* tests/types/gitesttypes.c:
	* tools/compiler.c (main):
	* tools/generate.c (write_repository): Remove unused variables
	and code, add missing includes, declarations and case
	statements.

Modified:
   trunk/ChangeLog
   trunk/girepository/ginfo.c
   trunk/girepository/girepository.c
   trunk/girepository/girmodule.c
   trunk/girepository/girnode.c
   trunk/girepository/girparser.c
   trunk/girepository/gtypelib.c
   trunk/giscanner/giscannermodule.c
   trunk/giscanner/scannerlexer.l
   trunk/giscanner/scannerparser.y
   trunk/giscanner/sourcescanner.c
   trunk/giscanner/sourcescanner.h
   trunk/tests/types/gitesttypes.c
   trunk/tools/compiler.c
   trunk/tools/generate.c

Modified: trunk/girepository/ginfo.c
==============================================================================
--- trunk/girepository/ginfo.c	(original)
+++ trunk/girepository/ginfo.c	Thu Oct 16 17:07:05 2008
@@ -19,6 +19,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <glib.h>
 #include <glib-object.h>

Modified: trunk/girepository/girepository.c
==============================================================================
--- trunk/girepository/girepository.c	(original)
+++ trunk/girepository/girepository.c	Thu Oct 16 17:07:05 2008
@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -261,8 +262,6 @@
   Header *header;
   const gchar *namespace;
   const gchar *version;
-  gboolean was_loaded;
-  gboolean currently_lazy;
 
   g_return_val_if_fail (typelib != NULL, FALSE);
   
@@ -418,17 +417,6 @@
   return get_repository (NULL);
 }
 
-static void 
-count_interfaces (gpointer key,
-		  gpointer value,
-		  gpointer data)
-{
-  guchar *typelib = ((GTypelib *) value)->data;
-  gint *n_interfaces = (gint *)data;
-  
-  *n_interfaces += ((Header *)typelib)->n_local_entries;
-}
-
 /**
  * g_irepository_get_n_infos
  * @repository: A #GIRepository, may be %NULL for the default
@@ -478,7 +466,6 @@
   IfaceData *iface_data = (IfaceData *)data;
   gint index;
   gint n_entries;
-  guint32 offset;
   const gchar *name;
   const gchar *type;
   DirEntry *entry;    
@@ -804,7 +791,6 @@
 
   for (ldir = search_path; ldir; ldir = ldir->next)
     {
-      Header *header;
       char *path = g_build_filename (ldir->data, fname, NULL);
       
       mfile = g_mapped_file_new (path, FALSE, &error);
@@ -827,7 +813,7 @@
 	       int *minor)
 {
   const char *dot;
-  const char *end;
+  char *end;
 
   *major = strtol (version, &end, 10);
   dot = strchr (version, '.');
@@ -1012,15 +998,11 @@
 		       GIRepositoryLoadFlags flags,
 		       GError       **error)
 {
-  const char *dir;
   GMappedFile *mfile;
   gboolean ret = FALSE;
-  GError *error1 = NULL;
   Header *header;
   GTypelib *typelib = NULL;
-  const gchar *typelib_namespace, *typelib_version, *shlib_fname;
-  GModule *module;
-  guint32 shlib;
+  const gchar *typelib_namespace, *typelib_version;
   gboolean allow_lazy = (flags & G_IREPOSITORY_LOAD_FLAG_LAZY) > 0;
   gboolean is_lazy;
   char *version_conflict = NULL;
@@ -1056,7 +1038,6 @@
   
   if (mfile == NULL)
     {
-      const char *error_fmt;
       if (version != NULL)
 	g_set_error (error, G_IREPOSITORY_ERROR,
 		     G_IREPOSITORY_ERROR_TYPELIB_NOT_FOUND,

Modified: trunk/girepository/girmodule.c
==============================================================================
--- trunk/girepository/girmodule.c	(original)
+++ trunk/girepository/girmodule.c	Thu Oct 16 17:07:05 2008
@@ -24,6 +24,9 @@
 #include "girmodule.h"
 #include "girnode.h"
 
+void _g_irnode_init_stats (void);
+void _g_irnode_dump_stats (void);
+
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
 
@@ -111,7 +114,7 @@
   }
 
  restart:
-  init_stats ();
+  _g_irnode_init_stats ();
   strings = g_hash_table_new (g_str_hash, g_str_equal);
   types = g_hash_table_new (g_str_hash, g_str_equal);
   n_entries = g_list_length (module->entries);
@@ -243,7 +246,7 @@
       entry++;
     }
 
-  dump_stats ();
+  _g_irnode_dump_stats ();
 
   header->annotations = offset2;
   

Modified: trunk/girepository/girnode.c
==============================================================================
--- trunk/girepository/girnode.c	(original)
+++ trunk/girepository/girnode.c	Thu Oct 16 17:07:05 2008
@@ -34,7 +34,7 @@
 static gulong unique_types_count = 0;
 
 void
-init_stats (void)
+_g_irnode_init_stats (void)
 {
   string_count = 0;
   unique_string_count = 0;
@@ -45,7 +45,7 @@
 }
 
 void
-dump_stats (void)
+_g_irnode_dump_stats (void)
 {
   g_message ("%lu strings (%lu before sharing), %lu bytes (%lu before sharing)",
 	     unique_string_count, string_count, unique_string_size, string_size);
@@ -870,6 +870,25 @@
     case G_IR_NODE_STRUCT:
     case G_IR_NODE_UNION:
       return TRUE;
+    /* list others individually rather than with default: so that compiler
+     * warns if new node types are added without adding them to the switch
+     */
+    case G_IR_NODE_INVALID:
+    case G_IR_NODE_FUNCTION:
+    case G_IR_NODE_CALLBACK:
+    case G_IR_NODE_ENUM:
+    case G_IR_NODE_FLAGS:
+    case G_IR_NODE_CONSTANT:
+    case G_IR_NODE_ERROR_DOMAIN:
+    case G_IR_NODE_PARAM:
+    case G_IR_NODE_TYPE:
+    case G_IR_NODE_PROPERTY:
+    case G_IR_NODE_SIGNAL:
+    case G_IR_NODE_VALUE:
+    case G_IR_NODE_VFUNC:
+    case G_IR_NODE_FIELD:
+    case G_IR_NODE_XREF:
+      return FALSE;
     };
   return FALSE;
 }

Modified: trunk/girepository/girparser.c
==============================================================================
--- trunk/girepository/girparser.c	(original)
+++ trunk/girepository/girparser.c	Thu Oct 16 17:07:05 2008
@@ -116,8 +116,6 @@
 			       gpointer             user_data,
 			       GError             **error)
 {
-  ParseContext *ctx = user_data;
-
 }
 
 static GMarkupParser firstpass_parser = 
@@ -136,8 +134,6 @@
   const gchar *const *dir;
   char *girname;
   char *path = NULL;
-  GSList *link;
-  gboolean firstpass = TRUE;
       
   datadirs = g_get_system_data_dirs ();
       
@@ -267,9 +263,6 @@
 {
   gint i;
   gint n_basic = G_N_ELEMENTS (basic_types);
-  gchar *temporary_type = NULL;
-  const gchar *start;
-  const gchar *end;
   
   for (i = 0; i < n_basic; i++)
     {
@@ -414,7 +407,7 @@
   g_free (temporary_type);
   return type;
 
- error:
+/* error: */
   g_ir_node_free ((GIrNode *)type);
   g_free (temporary_type);  
   return NULL;
@@ -430,7 +423,7 @@
   seen_values = g_slist_prepend (seen_values, (char*)type);
   while (g_hash_table_lookup_extended (ctx->aliases, type, &orig, &value))
     {
-      g_debug ("Resolved: %s => %s", type, value);
+      g_debug ("Resolved: %s => %s", type, (char*)value);
       type = value;
       if (g_slist_find_custom (seen_values, type,
 			       (GCompareFunc)strcmp) != NULL)
@@ -444,11 +437,9 @@
 static GIrNodeType *
 parse_type (ParseContext *ctx, const gchar *type)
 {
-  gchar *str;
   GIrNodeType *node;
   const BasicTypeInfo *basic;
   gboolean in_glib, in_gobject;
-  gboolean matched_special = FALSE;
 
   in_glib = strcmp (ctx->namespace, "GLib") == 0;
   in_gobject = strcmp (ctx->namespace, "GObject") == 0;
@@ -944,7 +935,6 @@
 {
   const gchar *name;
   const gchar *target;
-  const gchar *type;
   char *key;
   char *value;
 
@@ -1474,6 +1464,28 @@
 		vfunc->is_varargs = TRUE;
 	      }
 	      break;
+	    /* list others individually rather than with default: so that compiler
+	     * warns if new node types are added without adding them to the switch
+	     */
+	    case G_IR_NODE_INVALID:
+	    case G_IR_NODE_ENUM:
+	    case G_IR_NODE_FLAGS:
+	    case G_IR_NODE_CONSTANT:
+	    case G_IR_NODE_ERROR_DOMAIN:
+	    case G_IR_NODE_PARAM:
+	    case G_IR_NODE_TYPE:
+	    case G_IR_NODE_PROPERTY:
+	    case G_IR_NODE_SIGNAL:
+	    case G_IR_NODE_VALUE:
+	    case G_IR_NODE_FIELD:
+	    case G_IR_NODE_XREF:
+	    case G_IR_NODE_STRUCT:
+	    case G_IR_NODE_BOXED:
+	    case G_IR_NODE_OBJECT:
+	    case G_IR_NODE_INTERFACE:
+	    case G_IR_NODE_UNION:
+	      g_assert_not_reached ();
+	      break;
 	    }
 	}
       ctx->type_stack = NULL;
@@ -1496,7 +1508,6 @@
     {
       const char *zero;
       const char *len;
-      int i;
 
       typenode = (GIrNodeType *)g_ir_node_new (G_IR_NODE_TYPE);
 
@@ -1604,7 +1615,6 @@
 static void
 end_type_recurse (ParseContext *ctx)
 {
-  GList *types;
   GIrNodeType *parent;
   GIrNodeType *param = NULL;
 
@@ -2051,7 +2061,6 @@
 	       GError             **error)
 {
   ParseContext sub_ctx = { 0 };
-  GMarkupParseContext *sub_context;
   gchar *buffer;
   gsize length;
   char *girpath;
@@ -2748,7 +2757,6 @@
 {
   ParseContext *ctx = user_data;
   GList *m;
-  int line_number, char_number;
 
   for (m = ctx->modules; m; m = m->next)
     g_ir_module_free (m->data);
@@ -2800,7 +2808,6 @@
   iter = module->entries;
   while (iter)
     {
-      GList *link = iter;
       GIrNode *node = iter->data;
 
       iter = iter->next;

Modified: trunk/girepository/gtypelib.c
==============================================================================
--- trunk/girepository/gtypelib.c	(original)
+++ trunk/girepository/gtypelib.c	Thu Oct 16 17:07:05 2008
@@ -808,7 +808,6 @@
 							   blob->signature,
 							   error);
       InterfaceTypeBlob *iface_type;
-      InterfaceBlob *iface;
 
       if (!simple)
 	return FALSE;
@@ -1281,8 +1280,7 @@
 {
   GTypelib *typelib = ctx->typelib;
   EnumBlob *blob;
-  ValueBlob *v1, *v2;
-  gint i, j; 
+  gint i;
 
   if (typelib->len < offset + sizeof (EnumBlob))
     {

Modified: trunk/giscanner/giscannermodule.c
==============================================================================
--- trunk/giscanner/giscannermodule.c	(original)
+++ trunk/giscanner/giscannermodule.c	Thu Oct 16 17:07:05 2008
@@ -126,7 +126,7 @@
 directive_get_options (PyGISourceDirective *self,
 		       void                *context)
 {
-  GSList *l, *symbols;
+  GSList *l;
   PyObject *list;
   int i = 0;
 
@@ -327,7 +327,7 @@
 type_get_child_list (PyGISourceType *self,
 		     void           *context)
 {
-  GList *l, *symbols;
+  GList *l;
   PyObject *list;
   int i = 0;
 

Modified: trunk/giscanner/scannerlexer.l
==============================================================================
--- trunk/giscanner/scannerlexer.l	(original)
+++ trunk/giscanner/scannerlexer.l	Thu Oct 16 17:07:05 2008
@@ -252,7 +252,6 @@
           char *ptr = g_strdup (parts[1]);
 	  char *start;
 	  char *end;
-	  char **option_parts, **option_part;
 
 	  options = NULL;
 	  start = strchr (ptr, '(');

Modified: trunk/giscanner/scannerparser.y
==============================================================================
--- trunk/giscanner/scannerparser.y	(original)
+++ trunk/giscanner/scannerparser.y	Thu Oct 16 17:07:05 2008
@@ -43,6 +43,8 @@
 extern int yylex (GISourceScanner *scanner);
 static void yyerror (GISourceScanner *scanner, const char *str);
  
+extern void ctype_free (GISourceType * type);
+
 static int last_enum_value = -1;
 static GHashTable *const_table = NULL;
 %}

Modified: trunk/giscanner/sourcescanner.c
==============================================================================
--- trunk/giscanner/sourcescanner.c	(original)
+++ trunk/giscanner/sourcescanner.c	Thu Oct 16 17:07:05 2008
@@ -21,6 +21,7 @@
  */
 
 #include "sourcescanner.h"
+#include <string.h>
 
 GISourceSymbol *
 gi_source_symbol_new (GISourceSymbolType type)

Modified: trunk/giscanner/sourcescanner.h
==============================================================================
--- trunk/giscanner/sourcescanner.h	(original)
+++ trunk/giscanner/sourcescanner.h	Thu Oct 16 17:07:05 2008
@@ -143,6 +143,8 @@
 						        const gchar      *filename);
 gboolean            gi_source_scanner_parse_file       (GISourceScanner  *igenerator,
 						        FILE             *file);
+void                gi_source_scanner_parse_macros     (GISourceScanner  *scanner,
+							GList            *filenames);
 void                gi_source_scanner_set_macro_scan   (GISourceScanner  *scanner,
 							gboolean          macro_scan);
 GSList *            gi_source_scanner_get_symbols      (GISourceScanner  *scanner);

Modified: trunk/tests/types/gitesttypes.c
==============================================================================
--- trunk/tests/types/gitesttypes.c	(original)
+++ trunk/tests/types/gitesttypes.c	Thu Oct 16 17:07:05 2008
@@ -1,5 +1,6 @@
 
 #include <gitesttypes.h>
+#include <string.h>
 
 /* basic types */
 gboolean test_boolean (gboolean in)

Modified: trunk/tools/compiler.c
==============================================================================
--- trunk/tools/compiler.c	(original)
+++ trunk/tools/compiler.c	Thu Oct 16 17:07:05 2008
@@ -169,7 +169,7 @@
 {
   GOptionContext *context;
   GError *error = NULL;
-  GList *c, *m, *modules; 
+  GList *m, *modules;
   gint i;
   g_typelib_check_sanity ();
 

Modified: trunk/tools/generate.c
==============================================================================
--- trunk/tools/generate.c	(original)
+++ trunk/tools/generate.c	Thu Oct 16 17:07:05 2008
@@ -1121,7 +1121,6 @@
 		  gboolean      needs_prefix)
 {
   FILE *ofile;
-  gchar *ns;
   gint i, j;
   char **dependencies;
   GIRepository *repository;