diff options
-rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 27 | ||||
-rw-r--r-- | tests/scanner/regress.c | 35 | ||||
-rw-r--r-- | tests/scanner/regress.h | 2 |
3 files changed, 0 insertions, 64 deletions
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index e1aea04d..45958c64 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1538,20 +1538,6 @@ call and can be released on return.</doc> </type> </return-value> </function> - <function name="test_ghash_everything_in" - c:identifier="regress_test_ghash_everything_in"> - <return-value transfer-ownership="none"> - <type name="none" c:type="void"/> - </return-value> - <parameters> - <parameter name="in" transfer-ownership="full"> - <type name="GLib.HashTable" c:type="GHashTable*"> - <type name="utf8"/> - <type name="utf8"/> - </type> - </parameter> - </parameters> - </function> <function name="test_ghash_everything_return" c:identifier="regress_test_ghash_everything_return"> <return-value transfer-ownership="full"> @@ -1561,19 +1547,6 @@ call and can be released on return.</doc> </type> </return-value> </function> - <function name="test_ghash_free" c:identifier="regress_test_ghash_free"> - <return-value transfer-ownership="none"> - <type name="none" c:type="void"/> - </return-value> - <parameters> - <parameter name="in" transfer-ownership="full"> - <type name="GLib.HashTable" c:type="GHashTable*"> - <type name="utf8"/> - <type name="utf8"/> - </type> - </parameter> - </parameters> - </function> <function name="test_ghash_nested_everything_return" c:identifier="regress_test_ghash_nested_everything_return"> <doc xml:whitespace="preserve">Specify nested parameterized types directly with the (type ) annotation.</doc> diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 1a7ea2ce..1343cf93 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -1175,18 +1175,6 @@ regress_test_table_ghash_const() } /** - * regress_test_ghash_free: - * @in: (transfer full) (element-type utf8 utf8): - */ -void -regress_test_ghash_free (GHashTable *in) -{ - /* keys and values are deleted iff an appropriate element destroy function - * was registered */ - g_hash_table_unref(in); -} - -/** * regress_test_ghash_null_return: * * Return value: (element-type utf8 utf8) (transfer none) (allow-none): @@ -1310,29 +1298,6 @@ regress_test_ghash_container_in (GHashTable *in) g_hash_table_destroy (in); } -static gboolean -ghash_freer(gpointer key, gpointer value, gpointer user_data) -{ - g_free(key); - g_free(value); - return TRUE; -} - -/** - * regress_test_ghash_everything_in: - * @in: (transfer full) (element-type utf8 utf8): - */ -void -regress_test_ghash_everything_in (GHashTable *in) -{ - assert_test_table_ghash (in); - /* free the elements, then free the container. Don't rely on the - * GHashTable's key/value destructor functions. */ - g_hash_table_foreach_steal (in, ghash_freer, NULL); - /* okay, dealloc the hash table. */ - g_hash_table_destroy (in); -} - /* Nested collection types */ /** diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index 1e68cfac..eb69aeee 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -118,8 +118,6 @@ void regress_test_ghash_null_out (const GHashTable **out); void regress_test_ghash_nothing_in (const GHashTable *in); void regress_test_ghash_nothing_in2 (GHashTable *in); void regress_test_ghash_container_in (GHashTable *in); -void regress_test_ghash_everything_in (GHashTable *in); -void regress_test_ghash_free (GHashTable *in); GHashTable *regress_test_ghash_nested_everything_return (void); GHashTable *regress_test_ghash_nested_everything_return2 (void); |