Some small cosmetic tweaks

* Fix compiler warnings:

- Missing return value in annotation-testing code

- Fix two function declarations to have a (void) parameter list --
  this is not C++ ;-)

* Add tools/g-ir-scanner to .gitignore, as it's now generated

diff --git a/.gitignore b/.gitignore
index b3e6131..2ec0f4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@ tests/scanner/utility-1.0.typelib
 tests/extended.gir.test
 tools/g-ir-compiler
 tools/g-ir-generate
+tools/g-ir-scanner

diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index 7c25d9a..cbc9244 100644 (file)
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -618,6 +618,7 @@ annotation_object_extra_annos (AnnotationObject *object)
 char *
 annotation_get_source_file (void)
 {
+  return NULL;
 }
 
 /**

diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h
index 8097cfc..be3a955 100644 (file)
--- a/tests/scanner/foo.h
+++ b/tests/scanner/foo.h
@@ -120,7 +120,7 @@ gboolean              foo_object_virtual_method    (FooObject *object, int first
 
 void                  foo_object_read              (FooObject *object, int offset, int length);
 
-int                   foo_object_static_meth       ();
+int                   foo_object_static_meth       (void);
 
 struct _FooSubobject
 {
@@ -133,9 +133,9 @@ struct _FooSubobjectClass
 };
 
 GType                 foo_subobject_get_type       (void) G_GNUC_CONST;
-FooSubobject*         foo_subobject_new            ();
+FooSubobject*         foo_subobject_new            (void);
 
-FooObject *           foo_object_get_default       ();
+FooObject *           foo_object_get_default       (void);
 
 GType                 foo_buffer_get_type          (void);