From 05d804ba387d8231552615fcbb69f3ce457d3ef6 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sat, 27 Nov 2021 19:26:35 +0100 Subject: codegen: Drop inconsistent space for ObjectType parameters --- codegen/valagtypemodule.vala | 2 +- .../out-parameter-free-on-error.c-expected | 4 ++-- tests/basic-types/floats.c-expected | 4 ++-- tests/basic-types/integers.c-expected | 12 ++++++------ .../control-flow/assigned-local-variable.c-expected | 4 ++-- tests/dbus/async-errors_client.c-expected | 10 +++++----- tests/dbus/async-errors_server.c-expected | 4 ++-- tests/dbus/async_client.c-expected | 10 +++++----- tests/dbus/async_server.c-expected | 4 ++-- tests/dbus/basic-types_client.c-expected | 10 +++++----- tests/dbus/basic-types_server.c-expected | 4 ++-- tests/dbus/dynamic-method_client.c-expected | 4 ++-- tests/dbus/dynamic-method_server.c-expected | 4 ++-- tests/dbus/errors_client.c-expected | 10 +++++----- tests/dbus/errors_server.c-expected | 4 ++-- tests/dbus/filedescriptor-async_client.c-expected | 10 +++++----- tests/dbus/filedescriptor-async_server.c-expected | 4 ++-- tests/dbus/filedescriptor-errors_client.c-expected | 8 ++++---- tests/dbus/filedescriptor_client.c-expected | 10 +++++----- tests/dbus/filedescriptor_server.c-expected | 4 ++-- tests/methods/local-functions.c-expected | 20 ++++++++++---------- tests/methods/parameter-out-free-on-error.c-expected | 8 ++++---- .../methods/parameter-ref-element-access.c-expected | 4 ++-- tests/objects/methods.c-expected | 20 ++++++++++---------- 24 files changed, 89 insertions(+), 89 deletions(-) diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala index ab6c5647f..e921eb295 100644 --- a/codegen/valagtypemodule.vala +++ b/codegen/valagtypemodule.vala @@ -34,7 +34,7 @@ public class Vala.GTypeModule : GErrorModule { string ctypename = get_ccode_name (param.variable_type); if (param.direction != ParameterDirection.IN) { - ctypename = "%s *".printf (ctypename); + ctypename = "%s*".printf (ctypename); } var cparam = new CCodeParameter (get_ccode_name (param), ctypename); diff --git a/tests/asynchronous/out-parameter-free-on-error.c-expected b/tests/asynchronous/out-parameter-free-on-error.c-expected index a23907d98..42cb84ff8 100644 --- a/tests/asynchronous/out-parameter-free-on-error.c-expected +++ b/tests/asynchronous/out-parameter-free-on-error.c-expected @@ -92,7 +92,7 @@ VALA_EXTERN void foo_async (Manam* i, GAsyncReadyCallback _callback_, gpointer _user_data_); VALA_EXTERN void foo_finish (GAsyncResult* _res_, - Manam* * o, + Manam** o, GError** error); static gboolean foo_async_co (FooAsyncData* _data_); static void run_data_free (gpointer _data); @@ -193,7 +193,7 @@ foo_async (Manam* i, void foo_finish (GAsyncResult* _res_, - Manam* * o, + Manam** o, GError** error) { FooAsyncData* _data_; diff --git a/tests/basic-types/floats.c-expected b/tests/basic-types/floats.c-expected index fd88fb4e0..0950106ff 100644 --- a/tests/basic-types/floats.c-expected +++ b/tests/basic-types/floats.c-expected @@ -67,7 +67,7 @@ double_parse (const gchar* str) static gboolean double_try_parse (const gchar* str, gdouble* _result_, - const gchar* * unparsed) + const gchar** unparsed) { gdouble _vala__result_ = 0.0; const gchar* _vala_unparsed = NULL; @@ -223,7 +223,7 @@ float_parse (const gchar* str) static gboolean float_try_parse (const gchar* str, gfloat* _result_, - const gchar* * unparsed) + const gchar** unparsed) { gfloat _vala__result_ = 0.0F; const gchar* _vala_unparsed = NULL; diff --git a/tests/basic-types/integers.c-expected b/tests/basic-types/integers.c-expected index eefe0db05..7afe97c3c 100644 --- a/tests/basic-types/integers.c-expected +++ b/tests/basic-types/integers.c-expected @@ -31,7 +31,7 @@ static void _vala_main (void); static gboolean int_try_parse (const gchar* str, gint* _result_, - const gchar* * unparsed, + const gchar** unparsed, guint _base) { gint _vala__result_ = 0; @@ -103,7 +103,7 @@ int_try_parse (const gchar* str, static gboolean long_try_parse (const gchar* str, glong* _result_, - const gchar* * unparsed, + const gchar** unparsed, guint _base) { glong _vala__result_ = 0L; @@ -157,7 +157,7 @@ long_try_parse (const gchar* str, static gboolean uint_try_parse (const gchar* str, guint* _result_, - const gchar* * unparsed, + const gchar** unparsed, guint _base) { guint _vala__result_ = 0U; @@ -229,7 +229,7 @@ uint_try_parse (const gchar* str, static gboolean ulong_try_parse (const gchar* str, gulong* _result_, - const gchar* * unparsed, + const gchar** unparsed, guint _base) { gulong _vala__result_ = 0UL; @@ -283,7 +283,7 @@ ulong_try_parse (const gchar* str, static gboolean int64_try_parse (const gchar* str, gint64* _result_, - const gchar* * unparsed, + const gchar** unparsed, guint _base) { gint64 _vala__result_ = 0LL; @@ -337,7 +337,7 @@ int64_try_parse (const gchar* str, static gboolean uint64_try_parse (const gchar* str, guint64* _result_, - const gchar* * unparsed, + const gchar** unparsed, guint _base) { guint64 _vala__result_ = 0ULL; diff --git a/tests/control-flow/assigned-local-variable.c-expected b/tests/control-flow/assigned-local-variable.c-expected index 62abc8597..8920f8df8 100644 --- a/tests/control-flow/assigned-local-variable.c-expected +++ b/tests/control-flow/assigned-local-variable.c-expected @@ -21,12 +21,12 @@ #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); -VALA_EXTERN gboolean foo (gchar* * s); +VALA_EXTERN gboolean foo (gchar** s); VALA_EXTERN gint bar (void); static void _vala_main (void); gboolean -foo (gchar* * s) +foo (gchar** s) { gchar* _vala_s = NULL; gchar* _tmp0_; diff --git a/tests/dbus/async-errors_client.c-expected b/tests/dbus/async-errors_client.c-expected index c8b334397..8d19f169a 100644 --- a/tests/dbus/async-errors_client.c-expected +++ b/tests/dbus/async-errors_client.c-expected @@ -44,7 +44,7 @@ struct _TestIface { void (*test_int) (Test* self, gint i, GAsyncReadyCallback _callback_, gpointer _user_data_); gint (*test_int_finish) (Test* self, GAsyncResult* _res_, gint* j, GError** error); void (*test_string) (Test* self, const gchar* s, GAsyncReadyCallback _callback_, gpointer _user_data_); - gchar* (*test_string_finish) (Test* self, GAsyncResult* _res_, gchar* * t, GError** error); + gchar* (*test_string_finish) (Test* self, GAsyncResult* _res_, gchar** t, GError** error); void (*test_cancellable) (Test* self, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_); void (*test_cancellable_finish) (Test* self, GAsyncResult* _res_, GError** error); }; @@ -122,7 +122,7 @@ VALA_EXTERN void test_test_string (Test* self, gpointer _user_data_); VALA_EXTERN gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error); VALA_EXTERN void test_test_cancellable (Test* self, GCancellable* cancellable, @@ -159,7 +159,7 @@ static void test_proxy_test_string_async (Test* self, gpointer _user_data_); static gchar* test_proxy_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error); static void test_proxy_test_cancellable_async (Test* self, GCancellable* cancellable, @@ -318,7 +318,7 @@ test_test_string (Test* self, gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error) { TestIface* _iface_; @@ -545,7 +545,7 @@ test_proxy_test_string_async (Test* self, static gchar* test_proxy_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error) { GAsyncResult *_inner_res; diff --git a/tests/dbus/async-errors_server.c-expected b/tests/dbus/async-errors_server.c-expected index 702f27b11..8498b1edf 100644 --- a/tests/dbus/async-errors_server.c-expected +++ b/tests/dbus/async-errors_server.c-expected @@ -158,7 +158,7 @@ VALA_EXTERN void test_test_string (Test* self, gpointer _user_data_); VALA_EXTERN gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error); static gboolean test_test_string_co (TestTestStringData* _data_); static gboolean _test_test_string_co_gsource_func (gpointer self); @@ -459,7 +459,7 @@ test_test_string (Test* self, gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error) { gchar* result; diff --git a/tests/dbus/async_client.c-expected b/tests/dbus/async_client.c-expected index fd2848a5f..6f008222f 100644 --- a/tests/dbus/async_client.c-expected +++ b/tests/dbus/async_client.c-expected @@ -47,7 +47,7 @@ struct _TestIface { void (*test_int) (Test* self, gint i, GAsyncReadyCallback _callback_, gpointer _user_data_); gint (*test_int_finish) (Test* self, GAsyncResult* _res_, gint* j, GError** error); void (*test_string) (Test* self, const gchar* s, GAsyncReadyCallback _callback_, gpointer _user_data_); - gchar* (*test_string_finish) (Test* self, GAsyncResult* _res_, gchar* * t, GError** error); + gchar* (*test_string_finish) (Test* self, GAsyncResult* _res_, gchar** t, GError** error); }; struct _TestTestVoidReadyData { @@ -120,7 +120,7 @@ VALA_EXTERN void test_test_string (Test* self, gpointer _user_data_); VALA_EXTERN gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error); static GType test_get_type_once (void); static void test_proxy_g_signal (GDBusProxy* proxy, @@ -150,7 +150,7 @@ static void test_proxy_test_string_async (Test* self, gpointer _user_data_); static gchar* test_proxy_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error); static void test_proxy_test_interface_init (TestIface* iface); static void _dbus_test_test_void (Test* self, @@ -293,7 +293,7 @@ test_test_string (Test* self, gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error) { TestIface* _iface_; @@ -498,7 +498,7 @@ test_proxy_test_string_async (Test* self, static gchar* test_proxy_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t, + gchar** t, GError** error) { GAsyncResult *_inner_res; diff --git a/tests/dbus/async_server.c-expected b/tests/dbus/async_server.c-expected index dae62a88f..b7085a347 100644 --- a/tests/dbus/async_server.c-expected +++ b/tests/dbus/async_server.c-expected @@ -137,7 +137,7 @@ VALA_EXTERN void test_test_string (Test* self, gpointer _user_data_); VALA_EXTERN gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t); + gchar** t); static gboolean test_test_string_co (TestTestStringData* _data_); static gboolean _test_test_string_co_gsource_func (gpointer self); VALA_EXTERN Test* test_new (void); @@ -410,7 +410,7 @@ test_test_string (Test* self, gchar* test_test_string_finish (Test* self, GAsyncResult* _res_, - gchar* * t) + gchar** t) { gchar* result; TestTestStringData* _data_; diff --git a/tests/dbus/basic-types_client.c-expected b/tests/dbus/basic-types_client.c-expected index 0621c47c4..a8e4ba234 100644 --- a/tests/dbus/basic-types_client.c-expected +++ b/tests/dbus/basic-types_client.c-expected @@ -39,7 +39,7 @@ struct _TestIface { GTypeInterface parent_iface; void (*test_void) (Test* self, GError** error); gint (*test_int) (Test* self, gint i, gint* j, GError** error); - gchar* (*test_string) (Test* self, const gchar* s, gchar* * t, GError** error); + gchar* (*test_string) (Test* self, const gchar* s, gchar** t, GError** error); gchar* (*get_test_property) (Test* self); void (*set_test_property) (Test* self, const gchar* value); gint (*get_test_int_property) (Test* self); @@ -60,7 +60,7 @@ VALA_EXTERN gint test_test_int (Test* self, GError** error); VALA_EXTERN gchar* test_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error); VALA_EXTERN gchar* test_get_test_property (Test* self); VALA_EXTERN void test_set_test_property (Test* self, @@ -81,7 +81,7 @@ static gint test_proxy_test_int (Test* self, GError** error); static gchar* test_proxy_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error); static gchar* test_dbus_proxy_get_test_property (Test* self); static void test_dbus_proxy_set_test_property (Test* self, @@ -184,7 +184,7 @@ test_test_int (Test* self, gchar* test_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error) { TestIface* _iface_; @@ -371,7 +371,7 @@ test_proxy_test_int (Test* self, static gchar* test_proxy_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error) { GDBusMessage *_message; diff --git a/tests/dbus/basic-types_server.c-expected b/tests/dbus/basic-types_server.c-expected index f0731f71b..4049ef6b3 100644 --- a/tests/dbus/basic-types_server.c-expected +++ b/tests/dbus/basic-types_server.c-expected @@ -74,7 +74,7 @@ VALA_EXTERN gint test_test_int (Test* self, gint* j); VALA_EXTERN gchar* test_test_string (Test* self, const gchar* s, - gchar* * t); + gchar** t); VALA_EXTERN Test* test_new (void); VALA_EXTERN Test* test_construct (GType object_type); VALA_EXTERN gchar* test_get_test_property (Test* self); @@ -201,7 +201,7 @@ test_test_int (Test* self, gchar* test_test_string (Test* self, const gchar* s, - gchar* * t) + gchar** t) { gchar* _vala_t = NULL; gchar* _tmp0_; diff --git a/tests/dbus/dynamic-method_client.c-expected b/tests/dbus/dynamic-method_client.c-expected index 92af699b4..d06bec69d 100644 --- a/tests/dbus/dynamic-method_client.c-expected +++ b/tests/dbus/dynamic-method_client.c-expected @@ -60,7 +60,7 @@ static void run_ready (GObject* source_object, gpointer _user_data_); static gint _dynamic_do_foo0 (GDBusProxy* self, gint param1, - gchar* * param2, + gchar** param2, GError** error); static void _vala_main (void); @@ -105,7 +105,7 @@ run_ready (GObject* source_object, static gint _dynamic_do_foo0 (GDBusProxy* self, gint param1, - gchar* * param2, + gchar** param2, GError** error) { GDBusMessage *_message; diff --git a/tests/dbus/dynamic-method_server.c-expected b/tests/dbus/dynamic-method_server.c-expected index d99ad9612..ad30a41eb 100644 --- a/tests/dbus/dynamic-method_server.c-expected +++ b/tests/dbus/dynamic-method_server.c-expected @@ -62,7 +62,7 @@ VALA_EXTERN guint test_register_object (void* object, GError** error); VALA_EXTERN gint test_do_foo (Test* self, gint i, - gchar* * s, + gchar** s, GError** error); VALA_EXTERN Test* test_new (void); VALA_EXTERN Test* test_construct (GType object_type); @@ -123,7 +123,7 @@ static const GDBusInterfaceVTable _test_dbus_interface_vtable = {test_dbus_inter gint test_do_foo (Test* self, gint i, - gchar* * s, + gchar** s, GError** error) { gchar* _vala_s = NULL; diff --git a/tests/dbus/errors_client.c-expected b/tests/dbus/errors_client.c-expected index b3e4476d6..912bfd490 100644 --- a/tests/dbus/errors_client.c-expected +++ b/tests/dbus/errors_client.c-expected @@ -46,7 +46,7 @@ struct _TestIface { GTypeInterface parent_iface; void (*test_void) (Test* self, GError** error); gint (*test_int) (Test* self, gint i, gint* j, GError** error); - gchar* (*test_string) (Test* self, const gchar* s, gchar* * t, GError** error); + gchar* (*test_string) (Test* self, const gchar* s, gchar** t, GError** error); void (*test_cancellable) (Test* self, GCancellable* cancellable, GError** error); void (*test_custom_error) (Test* self, GError** error); }; @@ -66,7 +66,7 @@ VALA_EXTERN gint test_test_int (Test* self, GError** error); VALA_EXTERN gchar* test_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error); VALA_EXTERN void test_test_cancellable (Test* self, GCancellable* cancellable, @@ -86,7 +86,7 @@ static gint test_proxy_test_int (Test* self, GError** error); static gchar* test_proxy_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error); static void test_proxy_test_cancellable (Test* self, GCancellable* cancellable, @@ -201,7 +201,7 @@ test_test_int (Test* self, gchar* test_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error) { TestIface* _iface_; @@ -363,7 +363,7 @@ test_proxy_test_int (Test* self, static gchar* test_proxy_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error) { GDBusMessage *_message; diff --git a/tests/dbus/errors_server.c-expected b/tests/dbus/errors_server.c-expected index c26fe466e..2c44e2df4 100644 --- a/tests/dbus/errors_server.c-expected +++ b/tests/dbus/errors_server.c-expected @@ -75,7 +75,7 @@ VALA_EXTERN gint test_test_int (Test* self, GError** error); VALA_EXTERN gchar* test_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error); VALA_EXTERN void test_test_cancellable (Test* self, GCancellable* cancellable, @@ -207,7 +207,7 @@ test_test_int (Test* self, gchar* test_test_string (Test* self, const gchar* s, - gchar* * t, + gchar** t, GError** error) { gchar* _vala_t = NULL; diff --git a/tests/dbus/filedescriptor-async_client.c-expected b/tests/dbus/filedescriptor-async_client.c-expected index 48950f085..180d44249 100644 --- a/tests/dbus/filedescriptor-async_client.c-expected +++ b/tests/dbus/filedescriptor-async_client.c-expected @@ -42,7 +42,7 @@ typedef struct _RunData RunData; struct _TestIface { GTypeInterface parent_iface; void (*test_in) (Test* self, GUnixInputStream* i, GAsyncReadyCallback _callback_, gpointer _user_data_); - GUnixInputStream* (*test_in_finish) (Test* self, GAsyncResult* _res_, GUnixInputStream* * j, GError** error); + GUnixInputStream* (*test_in_finish) (Test* self, GAsyncResult* _res_, GUnixInputStream** j, GError** error); }; struct _TestTestInReadyData { @@ -123,7 +123,7 @@ VALA_EXTERN void test_test_in (Test* self, gpointer _user_data_); VALA_EXTERN GUnixInputStream* test_test_in_finish (Test* self, GAsyncResult* _res_, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error); static GType test_get_type_once (void); static void test_proxy_g_signal (GDBusProxy* proxy, @@ -139,7 +139,7 @@ static void test_proxy_test_in_async (Test* self, gpointer _user_data_); static GUnixInputStream* test_proxy_test_in_finish (Test* self, GAsyncResult* _res_, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error); static void test_proxy_test_interface_init (TestIface* iface); static void _dbus_test_test_in (Test* self, @@ -210,7 +210,7 @@ test_test_in (Test* self, GUnixInputStream* test_test_in_finish (Test* self, GAsyncResult* _res_, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error) { TestIface* _iface_; @@ -314,7 +314,7 @@ test_proxy_test_in_async (Test* self, static GUnixInputStream* test_proxy_test_in_finish (Test* self, GAsyncResult* _res_, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error) { GUnixFDList* _fd_list; diff --git a/tests/dbus/filedescriptor-async_server.c-expected b/tests/dbus/filedescriptor-async_server.c-expected index cad4f9924..1547eb1c7 100644 --- a/tests/dbus/filedescriptor-async_server.c-expected +++ b/tests/dbus/filedescriptor-async_server.c-expected @@ -126,7 +126,7 @@ VALA_EXTERN void test_test_in (Test* self, gpointer _user_data_); VALA_EXTERN GUnixInputStream* test_test_in_finish (Test* self, GAsyncResult* _res_, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error); static gboolean test_test_in_co (TestTestInData* _data_); static gboolean _test_test_in_co_gsource_func (gpointer self); @@ -231,7 +231,7 @@ test_test_in (Test* self, GUnixInputStream* test_test_in_finish (Test* self, GAsyncResult* _res_, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error) { GUnixInputStream* result; diff --git a/tests/dbus/filedescriptor-errors_client.c-expected b/tests/dbus/filedescriptor-errors_client.c-expected index 81354210a..67a5feb38 100644 --- a/tests/dbus/filedescriptor-errors_client.c-expected +++ b/tests/dbus/filedescriptor-errors_client.c-expected @@ -85,8 +85,8 @@ static gboolean test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data); static void _test_unregister_object (gpointer user_data); -VALA_EXTERN void create_streams (GUnixInputStream* * input, - GUnixOutputStream* * output, +VALA_EXTERN void create_streams (GUnixInputStream** input, + GUnixOutputStream** output, GError** error); static void _vala_main (void); @@ -354,8 +354,8 @@ _test_unregister_object (gpointer user_data) } void -create_streams (GUnixInputStream* * input, - GUnixOutputStream* * output, +create_streams (GUnixInputStream** input, + GUnixOutputStream** output, GError** error) { GUnixInputStream* _vala_input = NULL; diff --git a/tests/dbus/filedescriptor_client.c-expected b/tests/dbus/filedescriptor_client.c-expected index 82312fc95..d61f5fd00 100644 --- a/tests/dbus/filedescriptor_client.c-expected +++ b/tests/dbus/filedescriptor_client.c-expected @@ -38,7 +38,7 @@ typedef GDBusProxyClass TestProxyClass; struct _TestIface { GTypeInterface parent_iface; - GUnixInputStream* (*test_in) (Test* self, GUnixInputStream* i, GUnixInputStream* * j, GError** error); + GUnixInputStream* (*test_in) (Test* self, GUnixInputStream* i, GUnixInputStream** j, GError** error); }; VALA_EXTERN GType test_proxy_get_type (void) G_GNUC_CONST ; @@ -49,7 +49,7 @@ VALA_EXTERN guint test_register_object (void* object, VALA_EXTERN GType test_get_type (void) G_GNUC_CONST ; VALA_EXTERN GUnixInputStream* test_test_in (Test* self, GUnixInputStream* i, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error); static GType test_get_type_once (void); static void test_proxy_g_signal (GDBusProxy* proxy, @@ -58,7 +58,7 @@ static void test_proxy_g_signal (GDBusProxy* proxy, GVariant* parameters); static GUnixInputStream* test_proxy_test_in (Test* self, GUnixInputStream* i, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error); static void test_proxy_test_interface_init (TestIface* iface); static void _dbus_test_test_in (Test* self, @@ -105,7 +105,7 @@ static const GDBusInterfaceVTable _test_dbus_interface_vtable = {test_dbus_inter GUnixInputStream* test_test_in (Test* self, GUnixInputStream* i, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error) { TestIface* _iface_; @@ -173,7 +173,7 @@ test_proxy_init (TestProxy* self) static GUnixInputStream* test_proxy_test_in (Test* self, GUnixInputStream* i, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error) { GUnixFDList* _fd_list; diff --git a/tests/dbus/filedescriptor_server.c-expected b/tests/dbus/filedescriptor_server.c-expected index ea51e67d3..25bd10991 100644 --- a/tests/dbus/filedescriptor_server.c-expected +++ b/tests/dbus/filedescriptor_server.c-expected @@ -64,7 +64,7 @@ VALA_EXTERN guint test_register_object (void* object, GError** error); VALA_EXTERN GUnixInputStream* test_test_in (Test* self, GUnixInputStream* i, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error); VALA_EXTERN Test* test_new (void); VALA_EXTERN Test* test_construct (GType object_type); @@ -125,7 +125,7 @@ static const GDBusInterfaceVTable _test_dbus_interface_vtable = {test_dbus_inter GUnixInputStream* test_test_in (Test* self, GUnixInputStream* i, - GUnixInputStream* * j, + GUnixInputStream** j, GError** error) { GUnixInputStream* _vala_j = NULL; diff --git a/tests/methods/local-functions.c-expected b/tests/methods/local-functions.c-expected index 6e49f842b..fadc17878 100644 --- a/tests/methods/local-functions.c-expected +++ b/tests/methods/local-functions.c-expected @@ -7,8 +7,8 @@ typedef gint (*_LocalFunc0_) (gpointer user_data); typedef gboolean (*_LocalFunc1_) (gint a, gint b, gpointer user_data); -typedef void (*_LocalFunc2_) (gchar* * s, gpointer user_data); -typedef const gchar* (*_LocalFunc3_) (gchar* * s, gpointer user_data); +typedef void (*_LocalFunc2_) (gchar** s, gpointer user_data); +typedef const gchar* (*_LocalFunc3_) (gchar** s, gpointer user_data); typedef struct _Block1Data Block1Data; #define _g_free0(var) (var = (g_free (var), NULL)) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -32,11 +32,11 @@ static gboolean ___lambda5_ (gint a, static gboolean ____lambda5___localfunc1_ (gint a, gint b, gpointer self); -static void ___lambda6_ (gchar* * s); -static void ____lambda6___localfunc2_ (gchar* * s, +static void ___lambda6_ (gchar** s); +static void ____lambda6___localfunc2_ (gchar** s, gpointer self); -static const gchar* ___lambda7_ (gchar* * s); -static const gchar* ____lambda7___localfunc3_ (gchar* * s, +static const gchar* ___lambda7_ (gchar** s); +static const gchar* ____lambda7___localfunc3_ (gchar** s, gpointer self); static Block1Data* @@ -93,7 +93,7 @@ ____lambda5___localfunc1_ (gint a, } static void -___lambda6_ (gchar* * s) +___lambda6_ (gchar** s) { gchar* _vala_s = NULL; gchar* _tmp0_; @@ -108,14 +108,14 @@ ___lambda6_ (gchar* * s) } static void -____lambda6___localfunc2_ (gchar* * s, +____lambda6___localfunc2_ (gchar** s, gpointer self) { ___lambda6_ (s); } static const gchar* -___lambda7_ (gchar* * s) +___lambda7_ (gchar** s) { gchar* _tmp0_; const gchar* result = NULL; @@ -129,7 +129,7 @@ ___lambda7_ (gchar* * s) } static const gchar* -____lambda7___localfunc3_ (gchar* * s, +____lambda7___localfunc3_ (gchar** s, gpointer self) { const gchar* result; diff --git a/tests/methods/parameter-out-free-on-error.c-expected b/tests/methods/parameter-out-free-on-error.c-expected index d4b813bbd..caa5e4638 100644 --- a/tests/methods/parameter-out-free-on-error.c-expected +++ b/tests/methods/parameter-out-free-on-error.c-expected @@ -57,10 +57,10 @@ VALA_EXTERN Manam* manam_new (void); VALA_EXTERN Manam* manam_construct (GType object_type); static GType manam_get_type_once (void); VALA_EXTERN void foo (Manam* i, - Manam* * o, + Manam** o, GError** error); VALA_EXTERN void bar (Manam* i, - Manam* * o, + Manam** o, GError** error); static void _vala_main (void); @@ -126,7 +126,7 @@ _g_object_ref0 (gpointer self) void foo (Manam* i, - Manam* * o, + Manam** o, GError** error) { Manam* _vala_o = NULL; @@ -153,7 +153,7 @@ foo (Manam* i, void bar (Manam* i, - Manam* * o, + Manam** o, GError** error) { Manam* _vala_o = NULL; diff --git a/tests/methods/parameter-ref-element-access.c-expected b/tests/methods/parameter-ref-element-access.c-expected index 4e23b1bd2..e87761df9 100644 --- a/tests/methods/parameter-ref-element-access.c-expected +++ b/tests/methods/parameter-ref-element-access.c-expected @@ -21,7 +21,7 @@ #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); -VALA_EXTERN void foo (gchar* * s); +VALA_EXTERN void foo (gchar** s); static void _vala_main (void); static void _vala_array_destroy (gpointer array, gssize array_length, @@ -31,7 +31,7 @@ static void _vala_array_free (gpointer array, GDestroyNotify destroy_func); void -foo (gchar* * s) +foo (gchar** s) { gchar* _tmp0_; g_return_if_fail (*s != NULL); diff --git a/tests/objects/methods.c-expected b/tests/objects/methods.c-expected index 121ad8979..51af592e8 100644 --- a/tests/objects/methods.c-expected +++ b/tests/objects/methods.c-expected @@ -359,7 +359,7 @@ static GType maman_bar_get_type_once (void); VALA_EXTERN GType maman_sub_bar_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (MamanSubBar, g_object_unref) static void maman_sub_bar_real_do_virtual_action (MamanBar* base); -static void maman_sub_bar_accept_ref_string (gchar* * str); +static void maman_sub_bar_accept_ref_string (gchar** str); static void maman_sub_bar_test_classes_methods_ref_parameters (void); static gint maman_sub_bar_main (void); VALA_EXTERN MamanSubBar* maman_sub_bar_new (void); @@ -373,10 +373,10 @@ VALA_EXTERN MamanSubFooBar* maman_sub_foo_bar_construct (GType object_type); VALA_EXTERN GType maman_foo_get_type (void) G_GNUC_CONST ; VALA_EXTERN void maman_foo_do_action (MamanFoo* self); VALA_EXTERN void maman_base_access_test (void); -VALA_EXTERN void test_out (gchar* * bar); -VALA_EXTERN void test_out_weak (const gchar* * bar); -VALA_EXTERN void test_ref (gchar* * bar); -VALA_EXTERN void test_ref_weak (const gchar* * bar); +VALA_EXTERN void test_out (gchar** bar); +VALA_EXTERN void test_out_weak (const gchar** bar); +VALA_EXTERN void test_ref (gchar** bar); +VALA_EXTERN void test_ref_weak (const gchar** bar); VALA_EXTERN void test_out_array_no_length (gchar*** bar); VALA_EXTERN void maman_class_test_run_test (void); static GType maman_sub_bar_get_type_once (void); @@ -553,7 +553,7 @@ maman_sub_bar_real_do_virtual_action (MamanBar* base) } static void -maman_sub_bar_accept_ref_string (gchar* * str) +maman_sub_bar_accept_ref_string (gchar** str) { g_return_if_fail (*str != NULL); } @@ -1394,7 +1394,7 @@ maman_base_access_test (void) } void -test_out (gchar* * bar) +test_out (gchar** bar) { gchar* _vala_bar = NULL; gchar* _tmp0_; @@ -1409,7 +1409,7 @@ test_out (gchar* * bar) } void -test_out_weak (const gchar* * bar) +test_out_weak (const gchar** bar) { const gchar* _vala_bar = NULL; _vala_bar = "hello"; @@ -1419,7 +1419,7 @@ test_out_weak (const gchar* * bar) } void -test_ref (gchar* * bar) +test_ref (gchar** bar) { gchar* _tmp0_; g_return_if_fail (*bar != NULL); @@ -1430,7 +1430,7 @@ test_ref (gchar* * bar) } void -test_ref_weak (const gchar* * bar) +test_ref_weak (const gchar** bar) { g_return_if_fail (*bar != NULL); _vala_assert (g_strcmp0 (*bar, "hello") == 0, "bar == \"hello\""); -- cgit v1.2.1