[gobject-introspection] tests: Mark unused function arguments with G_GNUC_UNUSED



commit 962ea1afed874c95e39d031399dd0b8a6d910d7c
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Apr 15 21:26:24 2019 -0700

    tests: Mark unused function arguments with G_GNUC_UNUSED
    
    These files are exported for other projects to compile, so they should
    compile with as few compiler warnings as possible. If GJS or PyGObject
    has -Wunused-parameter turned on, then there should not be warnings in
    these files.

 tests/gimarshallingtests.c             |  75 +++++----
 tests/scanner/Regress-1.0-expected.gir | 280 ++++++++++++++++-----------------
 tests/scanner/regress.c                | 112 ++++++-------
 tests/scanner/warnlib.c                |   2 +-
 4 files changed, 247 insertions(+), 222 deletions(-)
---
diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c
index d65ce538..2c826f07 100644
--- a/tests/gimarshallingtests.c
+++ b/tests/gimarshallingtests.c
@@ -1111,7 +1111,7 @@ gi_marshalling_tests_utf8_full_out (gchar **utf8)
  * @utf8: (out) (transfer full):
  */
 void
-gi_marshalling_tests_utf8_dangling_out (gchar **utf8)
+gi_marshalling_tests_utf8_dangling_out (gchar **utf8 G_GNUC_UNUSED)
 {
   /* Intentionally don't touch the pointer to see how
      the bindings handle this case.  Bindings should be
@@ -1658,7 +1658,8 @@ gi_marshalling_tests_array_inout_etc (gint first, gint **ints, gint *length, gin
  * @chars: (array):
  */
 void
-gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *chars)
+gi_marshalling_tests_array_in_nonzero_nonlen (gint          first G_GNUC_UNUSED,
+                                              const guint8 *chars)
 {
   g_assert (chars[0] == 'a');
   g_assert (chars[1] == 'b');
@@ -3530,9 +3531,12 @@ _closure_return_42 (void)
 }
 
 static void
-_marshal_INT__VOID (GClosure *closure,
-                    GValue *return_value,
-                    guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer 
marshal_data)
+_marshal_INT__VOID (GClosure     *closure,
+                    GValue       *return_value,
+                    guint         n_param_values G_GNUC_UNUSED,
+                    const GValue *param_values G_GNUC_UNUSED,
+                    gpointer      invocation_hint G_GNUC_UNUSED,
+                    gpointer      marshal_data G_GNUC_UNUSED)
 {
   typedef gint (*GMarshalFunc_INT__VOID) (void);
   register GMarshalFunc_INT__VOID callback;
@@ -4120,7 +4124,7 @@ static void
 G_DEFINE_TYPE (GIMarshallingTestsObject, gi_marshalling_tests_object, G_TYPE_OBJECT);
 
 static void
-gi_marshalling_tests_object_init (GIMarshallingTestsObject *object)
+gi_marshalling_tests_object_init (GIMarshallingTestsObject *self G_GNUC_UNUSED)
 {
 }
 
@@ -4210,7 +4214,8 @@ gi_marshalling_tests_object_new (gint int_)
 }
 
 GIMarshallingTestsObject *
-gi_marshalling_tests_object_new_fail (gint int_, GError **error)
+gi_marshalling_tests_object_new_fail (gint     int_ G_GNUC_UNUSED,
+                                      GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
@@ -4227,7 +4232,9 @@ gi_marshalling_tests_object_new_fail (gint int_, GError **error)
  * @ints: (array length=length):
  */
 void
-gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *object, const gint *ints, gint length)
+gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *self G_GNUC_UNUSED,
+                                             const gint               *ints,
+                                             gint                      length)
 {
   g_assert_cmpint (length, ==, 4);
   g_assert_cmpint (ints[0], ==, -1);
@@ -4241,7 +4248,9 @@ gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *object, c
  * @ints: (out) (array length=length) (transfer none):
  */
 void
-gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *object, gint **ints, gint *length)
+gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *self G_GNUC_UNUSED,
+                                              gint                    **ints,
+                                              gint                     *length)
 {
   static gint values[] = { -1, 0, 1, 2 };
 
@@ -4255,7 +4264,9 @@ gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *object,
  * @length: (inout):
  */
 void
-gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *object, gint **ints, gint *length)
+gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *self G_GNUC_UNUSED,
+                                                gint                    **ints,
+                                                gint                     *length)
 {
   static gint values[] = { -2, -1, 0, 1, 2 };
 
@@ -4275,7 +4286,8 @@ gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *object
  * Returns: (array length=length):
  */
 const gint *
-gi_marshalling_tests_object_method_array_return (GIMarshallingTestsObject *object, gint *length)
+gi_marshalling_tests_object_method_array_return (GIMarshallingTestsObject *self G_GNUC_UNUSED,
+                                                 gint                     *length)
 {
   static gint ints[] = { -1, 0, 1, 2 };
 
@@ -4359,8 +4371,9 @@ static void
  * @callback_data: (allow-none):
  */
 void
-gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject *
-                                                 object, GIMarshallingTestsCallbackIntInt callback, void 
*callback_data)
+gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject        *self G_GNUC_UNUSED,
+                                                 GIMarshallingTestsCallbackIntInt callback G_GNUC_UNUSED,
+                                                 void                            *callback_data 
G_GNUC_UNUSED)
 {
 
 }
@@ -4731,7 +4744,8 @@ void
 }
 
 static void
-_vfunc_in_object_destroy_callback (gboolean *destroy_called, GObject *where_the_object_was)
+_vfunc_in_object_destroy_callback (gboolean *destroy_called,
+                                   GObject  *where_the_object_was G_GNUC_UNUSED)
 {
   *destroy_called = TRUE;
 }
@@ -4807,7 +4821,7 @@ void
 G_DEFINE_TYPE (GIMarshallingTestsSubObject, gi_marshalling_tests_sub_object, 
GI_MARSHALLING_TESTS_TYPE_OBJECT);
 
 static void
-gi_marshalling_tests_sub_object_init (GIMarshallingTestsSubObject *object)
+gi_marshalling_tests_sub_object_init (GIMarshallingTestsSubObject *self G_GNUC_UNUSED)
 {
 }
 
@@ -4848,18 +4862,19 @@ G_DEFINE_TYPE (GIMarshallingTestsSubSubObject,
                gi_marshalling_tests_sub_sub_object, GI_MARSHALLING_TESTS_TYPE_SUB_OBJECT);
 
 static void
-gi_marshalling_tests_sub_sub_object_init (GIMarshallingTestsSubSubObject *object)
+gi_marshalling_tests_sub_sub_object_init (GIMarshallingTestsSubSubObject *self G_GNUC_UNUSED)
 {
 }
 
-static void gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSubSubObjectClass *klass)
+static void gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSubSubObjectClass *klass 
G_GNUC_UNUSED)
 {
 }
 
 /* Interfaces */
 
 static void
-gi_marshalling_tests_interface_class_init (void *g_iface, void *data)
+gi_marshalling_tests_interface_class_init (void *g_iface G_GNUC_UNUSED,
+                                           void *data G_GNUC_UNUSED)
 {
 }
 
@@ -4907,7 +4922,8 @@ G_DEFINE_TYPE_WITH_CODE (GIMarshallingTestsInterfaceImpl, gi_marshalling_tests_i
                          G_IMPLEMENT_INTERFACE(GI_MARSHALLING_TESTS_TYPE_INTERFACE, test_interface_init))
 
 static void
-gi_marshalling_tests_interface_impl_test_int8_in (GIMarshallingTestsInterface *self, gint8 in)
+gi_marshalling_tests_interface_impl_test_int8_in (GIMarshallingTestsInterface *self G_GNUC_UNUSED,
+                                                  gint8                        in G_GNUC_UNUSED)
 {
 }
 
@@ -4917,12 +4933,12 @@ static void test_interface_init (GIMarshallingTestsInterfaceIface *iface)
 }
 
 static void
-gi_marshalling_tests_interface_impl_init (GIMarshallingTestsInterfaceImpl *object)
+gi_marshalling_tests_interface_impl_init (GIMarshallingTestsInterfaceImpl *self G_GNUC_UNUSED)
 {
 }
 
 static void
-gi_marshalling_tests_interface_impl_class_init (GIMarshallingTestsInterfaceImplClass *klass)
+gi_marshalling_tests_interface_impl_class_init (GIMarshallingTestsInterfaceImplClass *klass G_GNUC_UNUSED)
 {
 }
 
@@ -4938,7 +4954,8 @@ gi_marshalling_tests_interface_impl_get_as_interface (GIMarshallingTestsInterfac
 }
 
 static void
-gi_marshalling_tests_interface2_class_init (void *g_iface, void *data)
+gi_marshalling_tests_interface2_class_init (void *g_iface G_GNUC_UNUSED,
+                                            void *data G_GNUC_UNUSED)
 {
 }
 
@@ -4959,7 +4976,8 @@ gi_marshalling_tests_interface2_get_type (void)
 }
 
 static void
-gi_marshalling_tests_interface3_class_init (void *g_iface, void *data)
+gi_marshalling_tests_interface3_class_init (void *g_iface G_GNUC_UNUSED,
+                                            void *data G_GNUC_UNUSED)
 {
 }
 
@@ -5123,7 +5141,8 @@ gi_marshalling_tests_gerror (GError **error)
  * @in_ints: (array zero-terminated):
  */
 void
-gi_marshalling_tests_gerror_array_in (gint *in_ints, GError **error)
+gi_marshalling_tests_gerror_array_in (gint    *in_ints G_GNUC_UNUSED,
+                                      GError **error)
 {
   GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
   g_set_error_literal (error, quark,
@@ -5226,7 +5245,7 @@ gi_marshalling_tests_overrides_struct_new (void)
   return g_slice_new (GIMarshallingTestsOverridesStruct);
 }
 
-glong gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct *struct_)
+glong gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct *self G_GNUC_UNUSED)
 {
   return 42;
 }
@@ -5247,7 +5266,7 @@ gi_marshalling_tests_overrides_struct_returnv (void)
 G_DEFINE_TYPE (GIMarshallingTestsOverridesObject, gi_marshalling_tests_overrides_object, G_TYPE_OBJECT);
 
 static void
-gi_marshalling_tests_overrides_object_init (GIMarshallingTestsOverridesObject *object)
+gi_marshalling_tests_overrides_object_init (GIMarshallingTestsOverridesObject *self G_GNUC_UNUSED)
 {
 }
 
@@ -5273,7 +5292,7 @@ gi_marshalling_tests_overrides_object_new (void)
   return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL);
 }
 
-glong gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *object)
+glong gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *self G_GNUC_UNUSED)
 {
   return 42;
 }
@@ -5361,7 +5380,7 @@ enum
 
 G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT);
 
-static void gi_marshalling_tests_properties_object_init (GIMarshallingTestsPropertiesObject *self)
+static void gi_marshalling_tests_properties_object_init (GIMarshallingTestsPropertiesObject *self 
G_GNUC_UNUSED)
 {
 }
 
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 3053b907..efbfc7ff 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -3129,7 +3129,7 @@ use it should be.</doc>
         <return-value transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4211">A new floating #RegressTestFloating</doc>
+               line="4217">A new floating #RegressTestFloating</doc>
           <type name="TestFloating" c:type="RegressTestFloating*"/>
         </return-value>
       </constructor>
@@ -3189,7 +3189,7 @@ use it should be.</doc>
         <return-value transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3337">A new #RegressTestFundamentalObject</doc>
+               line="3340">A new #RegressTestFundamentalObject</doc>
           <type name="TestFundamentalObject"
                 c:type="RegressTestFundamentalObject*"/>
         </return-value>
@@ -3436,7 +3436,7 @@ use it should be.</doc>
           <instance-parameter name="self" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="4070">the object to emit the signal</doc>
+                 line="4076">the object to emit the signal</doc>
             <type name="TestInterface" c:type="RegressTestInterface*"/>
           </instance-parameter>
         </parameters>
@@ -3455,7 +3455,7 @@ use it should be.</doc>
           <parameter name="ptr" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="4051">the code must look up the signal with
+                 line="4057">the code must look up the signal with
   g_interface_info_find_signal() in order to get this to work.</doc>
             <type name="gint" c:type="gpointer"/>
           </parameter>
@@ -3499,7 +3499,7 @@ use it should be.</doc>
           <parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2768">A #RegressTestObj</doc>
+                 line="2770">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </parameter>
         </parameters>
@@ -3557,7 +3557,7 @@ use it should be.</doc>
                      allow-none="1">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3156">A #RegressTestObj</doc>
+                 line="3159">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj**"/>
           </parameter>
         </parameters>
@@ -3627,7 +3627,7 @@ use it should be.</doc>
       <virtual-method name="matrix" invoker="do_matrix">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="3130">This method is virtual.  Notably its name differs from the virtual
+             line="3133">This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</doc>
         <source-position filename="regress.h" line="797"/>
@@ -3638,13 +3638,13 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3132">A #RegressTestObj</doc>
+                 line="3135">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="somestr" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3133">Meaningless string</doc>
+                 line="3136">Meaningless string</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -3652,7 +3652,7 @@ case.</doc>
       <method name="do_matrix" c:identifier="regress_test_obj_do_matrix">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="3130">This method is virtual.  Notably its name differs from the virtual
+             line="3133">This method is virtual.  Notably its name differs from the virtual
 slot name, which makes it useful for testing bindings handle this
 case.</doc>
         <source-position filename="regress.h" line="940"/>
@@ -3663,13 +3663,13 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3132">A #RegressTestObj</doc>
+                 line="3135">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="somestr" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3133">Meaningless string</doc>
+                 line="3136">Meaningless string</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -3702,7 +3702,7 @@ case.</doc>
               c:identifier="regress_test_obj_emit_sig_with_inout_int">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2858">The signal handler must increment the inout parameter by 1.</doc>
+             line="2861">The signal handler must increment the inout parameter by 1.</doc>
         <source-position filename="regress.h" line="846"/>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -3711,7 +3711,7 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2860">The object to emit the signal.</doc>
+                 line="2863">The object to emit the signal.</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
         </parameters>
@@ -3761,7 +3761,7 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2897">A #RegressTestObj</doc>
+                 line="2900">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
         </parameters>
@@ -3819,7 +3819,7 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3200">A #RegressTestObj</doc>
+                 line="3203">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
         </parameters>
@@ -3834,13 +3834,13 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3187">A #RegressTestObj</doc>
+                 line="3190">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="input" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3188">some uint8 array</doc>
+                 line="3191">some uint8 array</doc>
             <array length="1" zero-terminated="0" c:type="gpointer">
               <type name="guint8"/>
             </array>
@@ -3848,7 +3848,7 @@ case.</doc>
           <parameter name="count" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3189">length of @input</doc>
+                 line="3192">length of @input</doc>
             <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
@@ -3863,13 +3863,13 @@ case.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3176">A #RegressTestObj</doc>
+                 line="3179">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="input" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3177">some #GObject</doc>
+                 line="3180">some #GObject</doc>
             <type name="GObject.Object" c:type="gpointer"/>
           </parameter>
         </parameters>
@@ -3896,25 +3896,25 @@ case.</doc>
               throws="1">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="3094">Check that the out value is skipped</doc>
+             line="3097">Check that the out value is skipped</doc>
         <source-position filename="regress.h" line="928"/>
         <return-value transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3108">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
+               line="3111">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3096">A #RegressTestObj.</doc>
+                 line="3099">A #RegressTestObj.</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="a" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3097">Parameter.</doc>
+                 line="3100">Parameter.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="out_b"
@@ -3923,13 +3923,13 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3098">Return value.</doc>
+                 line="3101">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="c" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3099">Other parameter.</doc>
+                 line="3102">Other parameter.</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
           <parameter name="inout_d"
@@ -3939,7 +3939,7 @@ case.</doc>
                      skip="1">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3100">Will be incremented.</doc>
+                 line="3103">Will be incremented.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="out_sum"
@@ -3948,19 +3948,19 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3101">Return value.</doc>
+                 line="3104">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="num1" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3102">Number.</doc>
+                 line="3105">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="num2" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3103">Number.</doc>
+                 line="3106">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -3970,25 +3970,25 @@ case.</doc>
               throws="1">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="3058">Check that the out value is skipped</doc>
+             line="3061">Check that the out value is skipped</doc>
         <source-position filename="regress.h" line="916"/>
         <return-value transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3072">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
+               line="3075">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3060">A #RegressTestObj.</doc>
+                 line="3063">A #RegressTestObj.</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="a" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3061">Parameter.</doc>
+                 line="3064">Parameter.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="out_b"
@@ -3998,13 +3998,13 @@ case.</doc>
                      skip="1">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3062">Return value.</doc>
+                 line="3065">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="c" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3063">Other parameter.</doc>
+                 line="3066">Other parameter.</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
           <parameter name="inout_d"
@@ -4013,7 +4013,7 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3064">Will be incremented.</doc>
+                 line="3067">Will be incremented.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="out_sum"
@@ -4022,19 +4022,19 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3065">Return value.</doc>
+                 line="3068">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="num1" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3066">Number.</doc>
+                 line="3069">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="num2" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3067">Number.</doc>
+                 line="3070">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -4044,25 +4044,25 @@ case.</doc>
               throws="1">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="3022">Check that a parameter is skipped</doc>
+             line="3025">Check that a parameter is skipped</doc>
         <source-position filename="regress.h" line="904"/>
         <return-value transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3036">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
+               line="3039">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3024">A #RegressTestObj.</doc>
+                 line="3027">A #RegressTestObj.</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="a" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3025">Parameter.</doc>
+                 line="3028">Parameter.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="out_b"
@@ -4071,13 +4071,13 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3026">Return value.</doc>
+                 line="3029">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="c" transfer-ownership="none" skip="1">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3027">Other parameter.</doc>
+                 line="3030">Other parameter.</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
           <parameter name="inout_d"
@@ -4086,7 +4086,7 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3028">Will be incremented.</doc>
+                 line="3031">Will be incremented.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="out_sum"
@@ -4095,19 +4095,19 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3029">Return value.</doc>
+                 line="3032">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="num1" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3030">Number.</doc>
+                 line="3033">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="num2" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3031">Number.</doc>
+                 line="3034">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -4117,25 +4117,25 @@ case.</doc>
               throws="1">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2962">Check that the return value is skipped</doc>
+             line="2965">Check that the return value is skipped</doc>
         <source-position filename="regress.h" line="886"/>
         <return-value transfer-ownership="none" skip="1">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="2976">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
+               line="2979">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2964">a #RegressTestObj</doc>
+                 line="2967">a #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="a" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2965">Parameter.</doc>
+                 line="2968">Parameter.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="out_b"
@@ -4144,13 +4144,13 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2966">A return value.</doc>
+                 line="2969">A return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="c" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2967">Other parameter.</doc>
+                 line="2970">Other parameter.</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
           <parameter name="inout_d"
@@ -4159,7 +4159,7 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2968">Will be incremented.</doc>
+                 line="2971">Will be incremented.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="out_sum"
@@ -4168,19 +4168,19 @@ case.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2969">Return value.</doc>
+                 line="2972">Return value.</doc>
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="num1" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2970">Number.</doc>
+                 line="2973">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
           <parameter name="num2" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2971">Number.</doc>
+                 line="2974">Number.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -4190,26 +4190,26 @@ case.</doc>
               throws="1">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2998">Check that the return value is skipped. Succeed if a is nonzero, otherwise
+             line="3001">Check that the return value is skipped. Succeed if a is nonzero, otherwise
 raise an error.</doc>
         <source-position filename="regress.h" line="898"/>
         <return-value transfer-ownership="none" skip="1">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3007">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
+               line="3010">%TRUE if the call succeeds, %FALSE if @error is set.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3000">a #RegressTestObj</doc>
+                 line="3003">a #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="a" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="3001">Parameter.</doc>
+                 line="3004">Parameter.</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -4224,7 +4224,7 @@ raise an error.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2907">A #RegressTestObj</doc>
+                 line="2910">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="x" transfer-ownership="none">
@@ -4261,7 +4261,7 @@ raise an error.</doc>
               throws="1">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2930">This function throws an error if m is odd.</doc>
+             line="2933">This function throws an error if m is odd.</doc>
         <source-position filename="regress.h" line="875"/>
         <return-value transfer-ownership="none">
           <type name="gboolean" c:type="gboolean"/>
@@ -4270,7 +4270,7 @@ raise an error.</doc>
           <instance-parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2932">A #RegressTestObj</doc>
+                 line="2935">A #RegressTestObj</doc>
             <type name="TestObj" c:type="RegressTestObj*"/>
           </instance-parameter>
           <parameter name="x" transfer-ownership="none">
@@ -4446,7 +4446,7 @@ raise an error.</doc>
       <glib:signal name="sig-with-array-len-prop" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2358">This test signal similar to GSettings::change-event.
+             line="2360">This test signal similar to GSettings::change-event.
 You can use this with regress_test_obj_emit_sig_with_array_len_prop(), or
 raise from the introspection client language.</doc>
         <return-value transfer-ownership="none">
@@ -4459,7 +4459,7 @@ raise from the introspection client language.</doc>
                      allow-none="1">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2361">numbers, or %NULL</doc>
+                 line="2363">numbers, or %NULL</doc>
             <array length="1" zero-terminated="0" c:type="gpointer">
               <type name="guint"/>
             </array>
@@ -4467,7 +4467,7 @@ raise from the introspection client language.</doc>
           <parameter name="len" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2362">length of @arr, or 0</doc>
+                 line="2364">length of @arr, or 0</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -4475,7 +4475,7 @@ raise from the introspection client language.</doc>
       <glib:signal name="sig-with-array-prop" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2338">This test signal is like TelepathyGlib's
+             line="2340">This test signal is like TelepathyGlib's
  TpChannel:: group-members-changed-detailed:</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4484,7 +4484,7 @@ raise from the introspection client language.</doc>
           <parameter name="arr" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2341">numbers</doc>
+                 line="2343">numbers</doc>
             <array name="GLib.Array">
               <type name="guint"/>
             </array>
@@ -4499,7 +4499,7 @@ raise from the introspection client language.</doc>
           <parameter name="cr" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2444">A cairo context.</doc>
+                 line="2446">A cairo context.</doc>
             <type name="cairo.Context"/>
           </parameter>
         </parameters>
@@ -4507,7 +4507,7 @@ raise from the introspection client language.</doc>
       <glib:signal name="sig-with-hash-prop" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2381">This test signal is like TelepathyGlib's
+             line="2383">This test signal is like TelepathyGlib's
  TpAccount::status-changed</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4524,7 +4524,7 @@ raise from the introspection client language.</doc>
       <glib:signal name="sig-with-inout-int" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2551">This signal is modeled after GtkEditable::insert-text.</doc>
+             line="2553">This signal is modeled after GtkEditable::insert-text.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
@@ -4535,7 +4535,7 @@ raise from the introspection client language.</doc>
                      transfer-ownership="full">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2554">The position, in characters, at which to
+                 line="2556">The position, in characters, at which to
     insert the new text. This is an in-out paramter. After the signal
     emission is finished, it should point after the newly inserted text.</doc>
             <type name="gint" c:type="gpointer"/>
@@ -4545,7 +4545,7 @@ raise from the introspection client language.</doc>
       <glib:signal name="sig-with-int64-prop" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2492">You can use this with regress_test_obj_emit_sig_with_int64, or raise from
+             line="2494">You can use this with regress_test_obj_emit_sig_with_int64, or raise from
 the introspection client langage.</doc>
         <return-value transfer-ownership="none">
           <type name="gint64" c:type="gint64"/>
@@ -4554,7 +4554,7 @@ the introspection client langage.</doc>
           <parameter name="i" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2495">an integer</doc>
+                 line="2497">an integer</doc>
             <type name="gint64" c:type="gint64"/>
           </parameter>
         </parameters>
@@ -4569,7 +4569,7 @@ the introspection client langage.</doc>
           <parameter name="i" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2535">an integer</doc>
+                 line="2537">an integer</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -4577,7 +4577,7 @@ the introspection client langage.</doc>
       <glib:signal name="sig-with-obj" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2420">Test transfer none GObject as a param (tests refcounting).
+             line="2422">Test transfer none GObject as a param (tests refcounting).
 Use with regress_test_obj_emit_sig_with_obj</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4586,7 +4586,7 @@ Use with regress_test_obj_emit_sig_with_obj</doc>
           <parameter name="obj" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2423">A newly created RegressTestObj</doc>
+                 line="2425">A newly created RegressTestObj</doc>
             <type name="GObject.Object"/>
           </parameter>
         </parameters>
@@ -4594,7 +4594,7 @@ Use with regress_test_obj_emit_sig_with_obj</doc>
       <glib:signal name="sig-with-strv" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2401">Test GStrv as a param.</doc>
+             line="2403">Test GStrv as a param.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
@@ -4602,7 +4602,7 @@ Use with regress_test_obj_emit_sig_with_obj</doc>
           <parameter name="strs" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2404">strings</doc>
+                 line="2406">strings</doc>
             <array>
               <type name="utf8"/>
             </array>
@@ -4612,7 +4612,7 @@ Use with regress_test_obj_emit_sig_with_obj</doc>
       <glib:signal name="sig-with-uint64-prop" when="last">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="2512">You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
+             line="2514">You can use this with regress_test_obj_emit_sig_with_uint64, or raise from
 the introspection client langage.</doc>
         <return-value transfer-ownership="none">
           <type name="guint64" c:type="guint64"/>
@@ -4621,7 +4621,7 @@ the introspection client langage.</doc>
           <parameter name="i" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="2515">an integer</doc>
+                 line="2517">an integer</doc>
             <type name="guint64" c:type="guint64"/>
           </parameter>
         </parameters>
@@ -4662,13 +4662,13 @@ the introspection client langage.</doc>
             <parameter name="obj" transfer-ownership="none">
               <doc xml:space="preserve"
                    filename="regress.c"
-                   line="3132">A #RegressTestObj</doc>
+                   line="3135">A #RegressTestObj</doc>
               <type name="TestObj" c:type="RegressTestObj*"/>
             </parameter>
             <parameter name="somestr" transfer-ownership="none">
               <doc xml:space="preserve"
                    filename="regress.c"
-                   line="3133">Meaningless string</doc>
+                   line="3136">Meaningless string</doc>
               <type name="utf8" c:type="const char*"/>
             </parameter>
           </parameters>
@@ -4896,7 +4896,7 @@ the introspection client langage.</doc>
       <method name="clone" c:identifier="regress_test_struct_a_clone">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="1719">Make a copy of a RegressTestStructA</doc>
+             line="1720">Make a copy of a RegressTestStructA</doc>
         <source-position filename="regress.h" line="547"/>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4905,7 +4905,7 @@ the introspection client langage.</doc>
           <instance-parameter name="a" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="1721">the structure</doc>
+                 line="1722">the structure</doc>
             <type name="TestStructA" c:type="RegressTestStructA*"/>
           </instance-parameter>
           <parameter name="a_out"
@@ -4914,7 +4914,7 @@ the introspection client langage.</doc>
                      transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="1722">the cloned structure</doc>
+                 line="1723">the cloned structure</doc>
             <type name="TestStructA" c:type="RegressTestStructA*"/>
           </parameter>
         </parameters>
@@ -4931,13 +4931,13 @@ the introspection client langage.</doc>
                      transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="1735">the structure that is to be filled</doc>
+                 line="1736">the structure that is to be filled</doc>
             <type name="TestStructA" c:type="RegressTestStructA*"/>
           </parameter>
           <parameter name="string" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="1736">ignored</doc>
+                 line="1737">ignored</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
@@ -4954,7 +4954,7 @@ the introspection client langage.</doc>
       <method name="clone" c:identifier="regress_test_struct_b_clone">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="1762">Make a copy of a RegressTestStructB</doc>
+             line="1763">Make a copy of a RegressTestStructB</doc>
         <source-position filename="regress.h" line="563"/>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4963,7 +4963,7 @@ the introspection client langage.</doc>
           <instance-parameter name="b" transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="1764">the structure</doc>
+                 line="1765">the structure</doc>
             <type name="TestStructB" c:type="RegressTestStructB*"/>
           </instance-parameter>
           <parameter name="b_out"
@@ -4972,7 +4972,7 @@ the introspection client langage.</doc>
                      transfer-ownership="none">
             <doc xml:space="preserve"
                  filename="regress.c"
-                 line="1765">the cloned structure</doc>
+                 line="1766">the cloned structure</doc>
             <type name="TestStructB" c:type="RegressTestStructB*"/>
           </parameter>
         </parameters>
@@ -5912,7 +5912,7 @@ exposed to language bindings.</doc>
                    allow-none="1">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3147">A #RegressTestObj</doc>
+               line="3150">A #RegressTestObj</doc>
           <type name="TestObj" c:type="RegressTestObj*"/>
         </parameter>
       </parameters>
@@ -5930,7 +5930,7 @@ exposed to language bindings.</doc>
                    allow-none="1">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3167">A #RegressTestObj</doc>
+               line="3170">A #RegressTestObj</doc>
           <type name="TestObj" c:type="RegressTestObj*"/>
         </parameter>
       </parameters>
@@ -5940,7 +5940,7 @@ exposed to language bindings.</doc>
       <return-value transfer-ownership="none">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="4487">A new variant</doc>
+             line="4493">A new variant</doc>
         <type name="GLib.Variant" c:type="GVariant*"/>
       </return-value>
     </function>
@@ -5957,7 +5957,7 @@ exposed to language bindings.</doc>
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="1624">A flags value</doc>
+               line="1625">A flags value</doc>
           <type name="TestFlags" c:type="RegressTestFlags*"/>
         </parameter>
       </parameters>
@@ -5966,7 +5966,7 @@ exposed to language bindings.</doc>
               c:identifier="regress_has_parameter_named_attrs">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4447">This test case mirrors GnomeKeyringPasswordSchema from
+           line="4453">This test case mirrors GnomeKeyringPasswordSchema from
 libgnome-keyring.</doc>
       <source-position filename="regress.h" line="1437"/>
       <return-value transfer-ownership="none">
@@ -5976,13 +5976,13 @@ libgnome-keyring.</doc>
         <parameter name="foo" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4449">some int</doc>
+               line="4455">some int</doc>
           <type name="gint" c:type="int"/>
         </parameter>
         <parameter name="attributes" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4450">list of attributes</doc>
+               line="4456">list of attributes</doc>
           <array zero-terminated="0" c:type="gpointer" fixed-size="32">
             <type name="guint32" c:type="gpointer"/>
           </array>
@@ -6077,7 +6077,7 @@ libgnome-keyring.</doc>
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3209">An array of #RegressTestObj</doc>
+               line="3212">An array of #RegressTestObj</doc>
           <array zero-terminated="0" c:type="RegressTestObj***" fixed-size="2">
             <type name="TestObj" c:type="RegressTestObj**"/>
           </array>
@@ -6393,7 +6393,7 @@ libgnome-keyring.</doc>
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="928">length</doc>
+               line="929">length</doc>
           <type name="gint" c:type="int*"/>
         </parameter>
       </parameters>
@@ -6431,7 +6431,7 @@ libgnome-keyring.</doc>
               c:identifier="regress_test_array_struct_in_full">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4579">Test flat array input with transfer full.
+           line="4585">Test flat array input with transfer full.
 
 Similar to:
 - gsf_property_settings_free() with structs but they contain pointers
@@ -6444,7 +6444,7 @@ Similar to:
         <parameter name="arr" transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4581">An array</doc>
+               line="4587">An array</doc>
           <array length="1" zero-terminated="0" c:type="RegressTestStructA*">
             <type name="TestStructA" c:type="RegressTestStructA"/>
           </array>
@@ -6452,7 +6452,7 @@ Similar to:
         <parameter name="len" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4582">Length of @arr</doc>
+               line="4588">Length of @arr</doc>
           <type name="gsize" c:type="gsize"/>
         </parameter>
       </parameters>
@@ -6461,7 +6461,7 @@ Similar to:
               c:identifier="regress_test_array_struct_in_none">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4599">Test flat array input with transfer none.
+           line="4605">Test flat array input with transfer none.
 
 Similar to g_main_context_check() or gtk_target_list_new().</doc>
       <source-position filename="regress.h" line="1522"/>
@@ -6472,7 +6472,7 @@ Similar to g_main_context_check() or gtk_target_list_new().</doc>
         <parameter name="arr" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4601">An array.</doc>
+               line="4607">An array.</doc>
           <array length="1" zero-terminated="0" c:type="RegressTestStructA*">
             <type name="TestStructA" c:type="RegressTestStructA"/>
           </array>
@@ -6480,7 +6480,7 @@ Similar to g_main_context_check() or gtk_target_list_new().</doc>
         <parameter name="len" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4602">Length of @arr</doc>
+               line="4608">Length of @arr</doc>
           <type name="gsize" c:type="gsize"/>
         </parameter>
       </parameters>
@@ -6489,7 +6489,7 @@ Similar to g_main_context_check() or gtk_target_list_new().</doc>
               c:identifier="regress_test_array_struct_out">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="1745">This is similar to gdk_keymap_get_entries_for_keyval().</doc>
+           line="1746">This is similar to gdk_keymap_get_entries_for_keyval().</doc>
       <source-position filename="regress.h" line="554"/>
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
@@ -6515,7 +6515,7 @@ Similar to g_main_context_check() or gtk_target_list_new().</doc>
               c:identifier="regress_test_array_struct_out_caller_alloc">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4558">Test flat caller-allocated array output.
+           line="4564">Test flat caller-allocated array output.
 
 Similar to g_main_context_query().</doc>
       <source-position filename="regress.h" line="1516"/>
@@ -6529,7 +6529,7 @@ Similar to g_main_context_query().</doc>
                    transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4560">An array</doc>
+               line="4566">An array</doc>
           <array length="1" zero-terminated="0" c:type="RegressTestStructA*">
             <type name="TestStructA" c:type="RegressTestStructA"/>
           </array>
@@ -6540,7 +6540,7 @@ Similar to g_main_context_query().</doc>
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4561">Length of @arr</doc>
+               line="4567">Length of @arr</doc>
           <type name="gsize" c:type="gsize"/>
         </parameter>
       </parameters>
@@ -6549,7 +6549,7 @@ Similar to g_main_context_query().</doc>
               c:identifier="regress_test_array_struct_out_container">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4520">Test flat array output with transfer container.
+           line="4526">Test flat array output with transfer container.
 
 Similar to pango_layout_get_log_attrs().</doc>
       <source-position filename="regress.h" line="1510"/>
@@ -6563,7 +6563,7 @@ Similar to pango_layout_get_log_attrs().</doc>
                    transfer-ownership="container">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4522">An array</doc>
+               line="4528">An array</doc>
           <array length="1" zero-terminated="0" c:type="RegressTestStructA**">
             <type name="TestStructA" c:type="RegressTestStructA*"/>
           </array>
@@ -6574,7 +6574,7 @@ Similar to pango_layout_get_log_attrs().</doc>
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4523">Length of @arr</doc>
+               line="4529">Length of @arr</doc>
           <type name="gsize" c:type="gsize*"/>
         </parameter>
       </parameters>
@@ -6583,7 +6583,7 @@ Similar to pango_layout_get_log_attrs().</doc>
               c:identifier="regress_test_array_struct_out_full_fixed">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4542">Test flat fixed-size array output with transfer full.</doc>
+           line="4548">Test flat fixed-size array output with transfer full.</doc>
       <source-position filename="regress.h" line="1513"/>
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
@@ -6595,7 +6595,7 @@ Similar to pango_layout_get_log_attrs().</doc>
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4544">An array</doc>
+               line="4550">An array</doc>
           <array zero-terminated="0"
                  c:type="RegressTestStructA**"
                  fixed-size="4">
@@ -6608,7 +6608,7 @@ Similar to pango_layout_get_log_attrs().</doc>
               c:identifier="regress_test_array_struct_out_none">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4495">Test flat array output with transfer none.
+           line="4501">Test flat array output with transfer none.
 
 Similar to:
 - mm_modem_peek_ports() with structs
@@ -6625,7 +6625,7 @@ Similar to:
                    transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4497">An array</doc>
+               line="4503">An array</doc>
           <array length="1" zero-terminated="0" c:type="RegressTestStructA**">
             <type name="TestStructA" c:type="RegressTestStructA*"/>
           </array>
@@ -6636,7 +6636,7 @@ Similar to:
                    transfer-ownership="full">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4498">Length of @arr</doc>
+               line="4504">Length of @arr</doc>
           <type name="gsize" c:type="gsize*"/>
         </parameter>
       </parameters>
@@ -6812,7 +6812,7 @@ Similar to:
               c:identifier="regress_test_callback_destroy_notify">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="3802">Notified - callback persists until a DestroyNotify delegate
+           line="3807">Notified - callback persists until a DestroyNotify delegate
 is invoked.</doc>
       <source-position filename="regress.h" line="1141"/>
       <return-value transfer-ownership="none">
@@ -6842,7 +6842,7 @@ is invoked.</doc>
               c:identifier="regress_test_callback_destroy_notify_no_user_data">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="3829">Adds a scope notified callback with no user data. This can invoke an error
+           line="3834">Adds a scope notified callback with no user data. This can invoke an error
 condition in bindings which needs to be tested.</doc>
       <source-position filename="regress.h" line="1146"/>
       <return-value transfer-ownership="none">
@@ -6885,14 +6885,14 @@ condition in bindings which needs to be tested.</doc>
               c:identifier="regress_test_callback_thaw_notifications">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="3843">Invokes all callbacks installed by #test_callback_destroy_notify(),
+           line="3848">Invokes all callbacks installed by #test_callback_destroy_notify(),
 adding up their return values, and removes them, invoking the
 corresponding destroy notfications.</doc>
       <source-position filename="regress.h" line="1150"/>
       <return-value transfer-ownership="none">
         <doc xml:space="preserve"
              filename="regress.c"
-             line="3850">Sum of the return values of the invoked callbacks.</doc>
+             line="3855">Sum of the return values of the invoked callbacks.</doc>
         <type name="gint" c:type="int"/>
       </return-value>
     </function>
@@ -6900,7 +6900,7 @@ corresponding destroy notfications.</doc>
               c:identifier="regress_test_callback_user_data">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="3771">Call - callback parameter persists for the duration of the method
+           line="3776">Call - callback parameter persists for the duration of the method
 call and can be released on return.</doc>
       <source-position filename="regress.h" line="1134"/>
       <return-value transfer-ownership="none">
@@ -7107,7 +7107,7 @@ call and can be released on return.</doc>
         <parameter name="hash" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="1342">the hash table returned by
+               line="1343">the hash table returned by
 regress_test_ghash_gvalue_return().</doc>
           <type name="GLib.HashTable" c:type="GHashTable*">
             <type name="utf8"/>
@@ -7130,7 +7130,7 @@ regress_test_ghash_gvalue_return().</doc>
               c:identifier="regress_test_ghash_nested_everything_return">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="1467">Specify nested parameterized types directly with the (type ) annotation.</doc>
+           line="1468">Specify nested parameterized types directly with the (type ) annotation.</doc>
       <source-position filename="regress.h" line="291"/>
       <return-value transfer-ownership="full">
         <type name="GLib.HashTable" c:type="GHashTable*">
@@ -7146,7 +7146,7 @@ regress_test_ghash_gvalue_return().</doc>
               c:identifier="regress_test_ghash_nested_everything_return2">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="1484">Another way of specifying nested parameterized types: using the
+           line="1485">Another way of specifying nested parameterized types: using the
 element-type annotation.</doc>
       <source-position filename="regress.h" line="294"/>
       <return-value transfer-ownership="full">
@@ -7538,7 +7538,7 @@ element-type annotation.</doc>
         <parameter name="data" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="3973">GHashTable that gets passed to callback</doc>
+               line="3979">GHashTable that gets passed to callback</doc>
           <type name="GLib.HashTable" c:type="GHashTable*">
             <type name="utf8"/>
             <type name="gint"/>
@@ -7690,7 +7690,7 @@ element-type annotation.</doc>
               c:identifier="regress_test_multiline_doc_comments">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4355">This is a function.
+           line="4361">This is a function.
 
 It has multiple lines in the documentation.
 
@@ -7706,7 +7706,7 @@ You will give me your credit card number.</doc>
               c:identifier="regress_test_nested_parameter">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4371">&lt;informaltable&gt;
+           line="4377">&lt;informaltable&gt;
   &lt;tgroup cols="3"&gt;
     &lt;thead&gt;
       &lt;row&gt;
@@ -7742,7 +7742,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
         <parameter name="a" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4373">An integer</doc>
+               line="4379">An integer</doc>
           <type name="gint" c:type="int"/>
         </parameter>
       </parameters>
@@ -7860,7 +7860,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
               introspectable="0">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4023">Should not emit a warning:
+           line="4029">Should not emit a warning:
 https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
       <source-position filename="regress.h" line="1189"/>
       <return-value transfer-ownership="none">
@@ -7870,7 +7870,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
         <parameter name="callback" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="4025">No annotation here</doc>
+               line="4031">No annotation here</doc>
           <type name="TestCallback" c:type="RegressTestCallback"/>
         </parameter>
       </parameters>
@@ -7900,13 +7900,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
                    transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="1735">the structure that is to be filled</doc>
+               line="1736">the structure that is to be filled</doc>
           <type name="TestStructA" c:type="RegressTestStructA*"/>
         </parameter>
         <parameter name="string" transfer-ownership="none">
           <doc xml:space="preserve"
                filename="regress.c"
-               line="1736">ignored</doc>
+               line="1737">ignored</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
       </parameters>
@@ -8024,7 +8024,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
               throws="1">
       <doc xml:space="preserve"
            filename="regress.c"
-           line="4243">This function throws an error if m is odd.</doc>
+           line="4249">This function throws an error if m is odd.</doc>
       <source-position filename="regress.h" line="1279"/>
       <return-value transfer-ownership="none">
         <type name="gboolean" c:type="gboolean"/>
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index 58220f35..728c7e81 100644
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -917,7 +917,8 @@ regress_test_array_int_none_out(int *len)
  * @len: length
  */
 void
-regress_test_array_int_null_in (int *arr, int len)
+regress_test_array_int_null_in (int *arr,
+                                int  len G_GNUC_UNUSED)
 {
   g_assert (arr == NULL);
 }
@@ -1737,7 +1738,7 @@ regress_test_struct_a_clone (RegressTestStructA *a,
  */
 void
 regress_test_struct_a_parse (RegressTestStructA *a_out,
-                             const gchar *string)
+                             const gchar        *string G_GNUC_UNUSED)
 {
        a_out->some_int = 23;
 }
@@ -1947,7 +1948,7 @@ regress_test_boxed_equals (RegressTestBoxed *boxed,
 }
 
 void
-regress_test_boxeds_not_a_method (RegressTestBoxed *boxed)
+regress_test_boxeds_not_a_method (RegressTestBoxed *boxed G_GNUC_UNUSED)
 {
 }
 
@@ -2279,7 +2280,8 @@ regress_test_obj_dispose (GObject *gobject)
 }
 
 static int
-regress_test_obj_default_matrix (RegressTestObj *obj, const char *somestr)
+regress_test_obj_default_matrix (RegressTestObj *obj G_GNUC_UNUSED,
+                                 const char     *somestr G_GNUC_UNUSED)
 {
   return 42;
 }
@@ -2768,7 +2770,7 @@ regress_test_obj_init (RegressTestObj *obj)
  * @obj: A #RegressTestObj
  */
 RegressTestObj *
-regress_test_obj_new (RegressTestObj *obj)
+regress_test_obj_new (RegressTestObj *obj G_GNUC_UNUSED)
 {
   return g_object_new (REGRESS_TEST_TYPE_OBJ, NULL);
 }
@@ -2787,7 +2789,8 @@ regress_constructor (void)
  * regress_test_obj_new_from_file:
  */
 RegressTestObj *
-regress_test_obj_new_from_file (const char *x, GError **error)
+regress_test_obj_new_from_file (const char *x G_GNUC_UNUSED,
+                                GError    **error G_GNUC_UNUSED)
 {
   return g_object_new (REGRESS_TEST_TYPE_OBJ, NULL);
 }
@@ -2870,7 +2873,7 @@ regress_test_obj_emit_sig_with_inout_int (RegressTestObj *obj)
 }
 
 int
-regress_test_obj_instance_method (RegressTestObj *obj)
+regress_test_obj_instance_method (RegressTestObj *obj G_GNUC_UNUSED)
 {
     return -1;
 }
@@ -2898,7 +2901,7 @@ regress_test_obj_static_method (int x)
  *
  */
 void
-regress_forced_method (RegressTestObj *obj)
+regress_forced_method (RegressTestObj *obj G_GNUC_UNUSED)
 {
 }
 
@@ -2914,7 +2917,7 @@ regress_forced_method (RegressTestObj *obj)
  *
  */
 void
-regress_test_obj_torture_signature_0 (RegressTestObj    *obj,
+regress_test_obj_torture_signature_0 (RegressTestObj    *obj G_GNUC_UNUSED,
                               int         x,
                               double     *y,
                               int        *z,
@@ -2941,7 +2944,7 @@ regress_test_obj_torture_signature_0 (RegressTestObj    *obj,
  * This function throws an error if m is odd.
  */
 gboolean
-regress_test_obj_torture_signature_1 (RegressTestObj   *obj,
+regress_test_obj_torture_signature_1 (RegressTestObj   *obj G_GNUC_UNUSED,
                               int        x,
                               double     *y,
                               int        *z,
@@ -2976,15 +2979,15 @@ regress_test_obj_torture_signature_1 (RegressTestObj   *obj,
  * Returns: (skip): %TRUE if the call succeeds, %FALSE if @error is set.
  */
 gboolean
-regress_test_obj_skip_return_val (RegressTestObj *obj,
+regress_test_obj_skip_return_val (RegressTestObj *obj G_GNUC_UNUSED,
                                   gint            a,
                                   gint           *out_b,
-                                  gdouble         c,
+                                  gdouble         c G_GNUC_UNUSED,
                                   gint           *inout_d,
                                   gint           *out_sum,
                                   gint            num1,
                                   gint            num2,
-                                  GError        **error)
+                                  GError        **error G_GNUC_UNUSED)
 {
   if (out_b != NULL)
     *out_b = a + 1;
@@ -3007,7 +3010,7 @@ regress_test_obj_skip_return_val (RegressTestObj *obj,
  * Returns: (skip): %TRUE if the call succeeds, %FALSE if @error is set.
  */
 gboolean
-regress_test_obj_skip_return_val_no_out (RegressTestObj *obj,
+regress_test_obj_skip_return_val_no_out (RegressTestObj *obj G_GNUC_UNUSED,
                                          gint            a,
                                          GError        **error)
 {
@@ -3036,15 +3039,15 @@ regress_test_obj_skip_return_val_no_out (RegressTestObj *obj,
  * Returns: %TRUE if the call succeeds, %FALSE if @error is set.
  */
 gboolean
-regress_test_obj_skip_param (RegressTestObj *obj,
+regress_test_obj_skip_param (RegressTestObj *obj G_GNUC_UNUSED,
                              gint            a,
                              gint           *out_b,
-                             gdouble         c,
+                             gdouble         c G_GNUC_UNUSED,
                              gint           *inout_d,
                              gint           *out_sum,
                              gint            num1,
                              gint            num2,
-                             GError        **error)
+                             GError        **error G_GNUC_UNUSED)
 {
   if (out_b != NULL)
     *out_b = a + 1;
@@ -3072,15 +3075,15 @@ regress_test_obj_skip_param (RegressTestObj *obj,
  * Returns: %TRUE if the call succeeds, %FALSE if @error is set.
  */
 gboolean
-regress_test_obj_skip_out_param (RegressTestObj *obj,
+regress_test_obj_skip_out_param (RegressTestObj *obj G_GNUC_UNUSED,
                                  gint            a,
                                  gint           *out_b,
-                                 gdouble         c,
+                                 gdouble         c G_GNUC_UNUSED,
                                  gint           *inout_d,
                                  gint           *out_sum,
                                  gint            num1,
                                  gint            num2,
-                                 GError        **error)
+                                 GError        **error G_GNUC_UNUSED)
 {
   if (out_b != NULL)
     *out_b = a + 1;
@@ -3108,15 +3111,15 @@ regress_test_obj_skip_out_param (RegressTestObj *obj,
  * Returns: %TRUE if the call succeeds, %FALSE if @error is set.
  */
 gboolean
-regress_test_obj_skip_inout_param (RegressTestObj *obj,
+regress_test_obj_skip_inout_param (RegressTestObj *obj G_GNUC_UNUSED,
                                    gint            a,
                                    gint           *out_b,
-                                   gdouble         c,
+                                   gdouble         c G_GNUC_UNUSED,
                                    gint           *inout_d,
                                    gint           *out_sum,
                                    gint            num1,
                                    gint            num2,
-                                   GError        **error)
+                                   GError        **error G_GNUC_UNUSED)
 {
   if (out_b != NULL)
     *out_b = a + 1;
@@ -3147,7 +3150,7 @@ regress_test_obj_do_matrix (RegressTestObj *obj, const char *somestr)
  * @obj: (allow-none): A #RegressTestObj
  */
 void
-regress_func_obj_null_in (RegressTestObj *obj)
+regress_func_obj_null_in (RegressTestObj *obj G_GNUC_UNUSED)
 {
 }
 
@@ -3167,7 +3170,7 @@ regress_test_obj_null_out (RegressTestObj **obj)
  * @obj: (nullable): A #RegressTestObj
  */
 void
-regress_func_obj_nullable_in (RegressTestObj *obj)
+regress_func_obj_nullable_in (RegressTestObj *obj G_GNUC_UNUSED)
 {
 }
 
@@ -3177,8 +3180,8 @@ regress_func_obj_nullable_in (RegressTestObj *obj)
  * @input: (type GObject): some #GObject
  */
 void
-regress_test_obj_not_nullable_typed_gpointer_in (RegressTestObj *obj,
-                                                 gpointer        input)
+regress_test_obj_not_nullable_typed_gpointer_in (RegressTestObj *obj G_GNUC_UNUSED,
+                                                 gpointer        input G_GNUC_UNUSED)
 {
 }
 
@@ -3189,9 +3192,9 @@ regress_test_obj_not_nullable_typed_gpointer_in (RegressTestObj *obj,
  * @count: length of @input
  */
 void
-regress_test_obj_not_nullable_element_typed_gpointer_in (RegressTestObj *obj,
-                                                         gpointer        input,
-                                                         guint           count)
+regress_test_obj_not_nullable_element_typed_gpointer_in (RegressTestObj *obj G_GNUC_UNUSED,
+                                                         gpointer        input G_GNUC_UNUSED,
+                                                         guint           count G_GNUC_UNUSED)
 {
 }
 
@@ -3200,7 +3203,7 @@ regress_test_obj_not_nullable_element_typed_gpointer_in (RegressTestObj *obj,
  * @obj: A #RegressTestObj
  */
 void
-regress_test_obj_name_conflict (RegressTestObj *obj)
+regress_test_obj_name_conflict (RegressTestObj *obj G_GNUC_UNUSED)
 {
 }
 
@@ -3229,7 +3232,7 @@ struct _CallbackInfo
 };
 
 static void
-regress_test_sub_obj_iface_init (RegressTestInterfaceIface *iface)
+regress_test_sub_obj_iface_init (RegressTestInterfaceIface *iface G_GNUC_UNUSED)
 {
 }
 
@@ -3307,7 +3310,7 @@ regress_test_sub_obj_class_init (RegressTestSubObjClass *klass)
 }
 
 static void
-regress_test_sub_obj_init (RegressTestSubObj *obj)
+regress_test_sub_obj_init (RegressTestSubObj *self G_GNUC_UNUSED)
 {
 }
 
@@ -3318,7 +3321,7 @@ regress_test_sub_obj_new (void)
 }
 
 int
-regress_test_sub_obj_instance_method (RegressTestSubObj *obj)
+regress_test_sub_obj_instance_method (RegressTestSubObj *self G_GNUC_UNUSED)
 {
     return 0;
 }
@@ -3427,10 +3430,10 @@ regress_test_value_fundamental_object_peek_pointer (const GValue * value)
 }
 
 static gchar *
-regress_test_value_fundamental_object_collect (GValue * value,
-                                       guint n_collect_values,
-                                       GTypeCValue * collect_values,
-                                       guint collect_flags)
+regress_test_value_fundamental_object_collect (GValue      *value,
+                                               guint        n_collect_values,
+                                               GTypeCValue *collect_values,
+                                               guint        collect_flags G_GNUC_UNUSED)
 {
   if (collect_values[0].v_pointer) {
     value->data[0].v_pointer =
@@ -3466,20 +3469,21 @@ regress_test_value_fundamental_object_lcopy (const GValue * value,
 }
 
 static void
-regress_test_fundamental_object_finalize (RegressTestFundamentalObject * obj)
+regress_test_fundamental_object_finalize (RegressTestFundamentalObject *self G_GNUC_UNUSED)
 {
 
 }
 
 static RegressTestFundamentalObject *
-regress_test_fundamental_object_copy_default (const RegressTestFundamentalObject * obj)
+regress_test_fundamental_object_copy_default (const RegressTestFundamentalObject *self G_GNUC_UNUSED)
 {
   g_warning ("RegressTestFundamentalObject classes must implement RegressTestFundamentalObject::copy");
   return NULL;
 }
 
 static void
-regress_test_fundamental_object_class_init (gpointer g_class, gpointer class_data)
+regress_test_fundamental_object_class_init (gpointer g_class,
+                                            gpointer class_data G_GNUC_UNUSED)
 {
   RegressTestFundamentalObjectClass *mo_class = REGRESS_TEST_FUNDAMENTAL_OBJECT_CLASS (g_class);
 
@@ -3488,7 +3492,8 @@ regress_test_fundamental_object_class_init (gpointer g_class, gpointer class_dat
 }
 
 static void
-regress_test_fundamental_object_init (GTypeInstance * instance, gpointer klass)
+regress_test_fundamental_object_init (GTypeInstance *instance,
+                                      gpointer       klass G_GNUC_UNUSED)
 {
   RegressTestFundamentalObject *fundamental_object = REGRESS_TEST_FUNDAMENTAL_OBJECT_CAST (instance);
 
@@ -3604,7 +3609,7 @@ regress_test_fundamental_sub_object_class_init (RegressTestFundamentalSubObjectC
 }
 
 static void
-regress_test_fundamental_sub_object_init(RegressTestFundamentalSubObject *object)
+regress_test_fundamental_sub_object_init(RegressTestFundamentalSubObject *self G_GNUC_UNUSED)
 {
 
 }
@@ -3640,12 +3645,12 @@ G_DEFINE_TYPE (RegressTestFundamentalHiddenSubObject,
                REGRESS_TEST_TYPE_FUNDAMENTAL_OBJECT);
 
 static void
-regress_test_fundamental_hidden_sub_object_init (RegressTestFundamentalHiddenSubObject *object)
+regress_test_fundamental_hidden_sub_object_init (RegressTestFundamentalHiddenSubObject *self G_GNUC_UNUSED)
 {
 }
 
 static void
-regress_test_fundamental_hidden_sub_object_class_init (RegressTestFundamentalHiddenSubObjectClass *klass)
+regress_test_fundamental_hidden_sub_object_class_init (RegressTestFundamentalHiddenSubObjectClass *klass 
G_GNUC_UNUSED)
 {
 }
 
@@ -3928,7 +3933,8 @@ regress_test_async_ready_callback (GAsyncReadyCallback callback)
  *
  **/
 void
-regress_test_obj_instance_method_callback (RegressTestObj *obj, RegressTestCallback callback)
+regress_test_obj_instance_method_callback (RegressTestObj     *self G_GNUC_UNUSED,
+                                           RegressTestCallback callback)
 {
     if (callback != NULL)
         callback();
@@ -4028,7 +4034,7 @@ regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback)
  * https://bugzilla.gnome.org/show_bug.cgi?id=685399
  */
 void
-regress_test_skip_unannotated_callback (RegressTestCallback callback)
+regress_test_skip_unannotated_callback (RegressTestCallback callback G_GNUC_UNUSED)
 {
 }
 
@@ -4201,7 +4207,7 @@ regress_test_floating_class_init (RegressTestFloatingClass *klass)
 }
 
 static void
-regress_test_floating_init (RegressTestFloating *obj)
+regress_test_floating_init (RegressTestFloating *self G_GNUC_UNUSED)
 {
 }
 
@@ -4402,7 +4408,7 @@ regress_test_multiline_doc_comments (void)
  * What we're testing here is that the scanner ignores the @a nested inside XML.
  */
 void
-regress_test_nested_parameter (int a)
+regress_test_nested_parameter (int a G_GNUC_UNUSED)
 {
 }
 
@@ -4411,7 +4417,7 @@ regress_test_nested_parameter (int a)
  *
  */
 void
-regress_introspectable_via_alias (RegressPtrArrayAlias *data)
+regress_introspectable_via_alias (RegressPtrArrayAlias *data G_GNUC_UNUSED)
 {
 }
 
@@ -4420,7 +4426,7 @@ regress_introspectable_via_alias (RegressPtrArrayAlias *data)
  *
  */
 void
-regress_not_introspectable_via_alias (RegressVaListAlias ok)
+regress_not_introspectable_via_alias (RegressVaListAlias ok G_GNUC_UNUSED)
 {
 }
 
@@ -4453,8 +4459,8 @@ regress_test_struct_fixed_array_frob (RegressTestStructFixedArray *str)
  * libgnome-keyring.
  */
 void
-regress_has_parameter_named_attrs (int        foo,
-                                   gpointer   attributes)
+regress_has_parameter_named_attrs (int        foo G_GNUC_UNUSED,
+                                   gpointer   attributes G_GNUC_UNUSED)
 {
 }
 
diff --git a/tests/scanner/warnlib.c b/tests/scanner/warnlib.c
index d7c1e2a1..4b92bf66 100644
--- a/tests/scanner/warnlib.c
+++ b/tests/scanner/warnlib.c
@@ -22,7 +22,7 @@ typedef WarnLibWhateverIface WarnLibWhateverInterface;
 G_DEFINE_INTERFACE (WarnLibWhatever, warnlib_whatever, G_TYPE_OBJECT)
 
 static void
-warnlib_whatever_default_init(WarnLibWhateverIface *iface)
+warnlib_whatever_default_init(WarnLibWhateverIface *iface G_GNUC_UNUSED)
 {
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]