gobject-introspection r1071 - in trunk: . giscanner tests/scanner tools

[danw svn gnome org]

Author: danw
Date: Tue Jan 27 17:17:31 2009
New Revision: 1071
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=1071&view=rev

Log:
	Misc warning fixes

	* giscanner/scannerparser.y: Fix the "Ignoring non-UTF-8 constant
	string" error to print the right value.

	* tests/scanner/annotation.c (backslash_parsing_tester)
	(backslash_parsing_tester_2): make these non-static to avoid a
	warning.
	(annotation_object_string_out)
	(annotation_string_zero_terminated): fix return values

	* tests/scanner/annotation.h (annotation_object_with_voidp):
	prototype this

	* tests/scanner/gtkfrob.c:
	* tests/scanner/gtkfrob.h (gtk_frob_language_manager_get_default):
	fix prototype. (s/()/(void)/).

	* tools/compiler.c (format_output): fix signed/unsigned warning.
	Output a prototype for register_typelib() to avoid warnings later.


Modified:
   trunk/ChangeLog
   trunk/giscanner/scannerparser.y
   trunk/tests/scanner/annotation.c
   trunk/tests/scanner/annotation.h
   trunk/tests/scanner/gtkfrob.c
   trunk/tests/scanner/gtkfrob.h
   trunk/tools/compiler.c

Modified: trunk/giscanner/scannerparser.y
==============================================================================
--- trunk/giscanner/scannerparser.y	(original)
+++ trunk/giscanner/scannerparser.y	Tue Jan 27 17:17:31 2009
@@ -185,7 +185,7 @@
 		$$->const_string = g_strcompress (yytext + 1);
                 if (!g_utf8_validate ($$->const_string, -1, NULL))
                   {
-                    g_warning ("Ignoring non-UTF-8 constant string %s", $$->ident);
+                    g_warning ("Ignoring non-UTF-8 constant string \"%s\"", yytext + 1);
                     g_free($$->const_string);
                     $$->const_string = NULL;
                   }

Modified: trunk/tests/scanner/annotation.c
==============================================================================
--- trunk/tests/scanner/annotation.c	(original)
+++ trunk/tests/scanner/annotation.c	Tue Jan 27 17:17:31 2009
@@ -1,6 +1,6 @@
 #include "annotation.h"
 
-static char backslash_parsing_tester = '\\';
+char backslash_parsing_tester = '\\';
 
 G_DEFINE_TYPE (AnnotationObject, annotation_object, G_TYPE_OBJECT);
 
@@ -408,7 +408,7 @@
 annotation_object_string_out(AnnotationObject *object,
                              char            **str_out)
 {
-
+  return FALSE;
 }
 
 /**
@@ -553,7 +553,6 @@
 void
 annotation_string_zero_terminated_out (char ***out)
 {
-  return NULL;
 }
 
 /**
@@ -567,4 +566,4 @@
 }
 
 
-static char backslash_parsing_tester_2 = '\\';
+char backslash_parsing_tester_2 = '\\';

Modified: trunk/tests/scanner/annotation.h
==============================================================================
--- trunk/tests/scanner/annotation.h	(original)
+++ trunk/tests/scanner/annotation.h	Tue Jan 27 17:17:31 2009
@@ -67,6 +67,8 @@
 					 GObject          **toown2);
 GList*   annotation_object_get_strings  (AnnotationObject *object);
 GHashTable*annotation_object_get_hash   (AnnotationObject *object);
+void     annotation_object_with_voidp   (AnnotationObject *object,
+					 void             *data);
 GSList*  annotation_object_get_objects  (AnnotationObject *object);
 
 void     annotation_object_use_buffer   (AnnotationObject *object,

Modified: trunk/tests/scanner/gtkfrob.c
==============================================================================
--- trunk/tests/scanner/gtkfrob.c	(original)
+++ trunk/tests/scanner/gtkfrob.c	Tue Jan 27 17:17:31 2009
@@ -1,6 +1,6 @@
 #include "gtkfrob.h"
 
 void
-gtk_frob_language_manager_get_default ()
+gtk_frob_language_manager_get_default (void)
 {
 }

Modified: trunk/tests/scanner/gtkfrob.h
==============================================================================
--- trunk/tests/scanner/gtkfrob.h	(original)
+++ trunk/tests/scanner/gtkfrob.h	Tue Jan 27 17:17:31 2009
@@ -6,6 +6,6 @@
 
 /* A global function */
 
-void gtk_frob_language_manager_get_default ();
+void gtk_frob_language_manager_get_default (void);
 
 #endif /* __GTKFROB_H__ */

Modified: trunk/tools/compiler.c
==============================================================================
--- trunk/tools/compiler.c	(original)
+++ trunk/tools/compiler.c	Tue Jan 27 17:17:31 2009
@@ -49,7 +49,7 @@
 format_output (GTypelib *typelib)
 {
   GString *result;
-  gint i;
+  guint i;
 
   result = g_string_sized_new (6 * typelib->len);
 
@@ -76,6 +76,9 @@
   if (!no_init)
     {
       g_string_append_printf (result,
+			      "__attribute__((constructor)) void "
+			      "register_typelib (void);\n\n");
+      g_string_append_printf (result,
 			      "__attribute__((constructor)) void\n"
 			      "register_typelib (void)\n"
 			      "{\n"