From ab940088e64c78928c35a1d976bc7876a5a4275b Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 6 Apr 2023 14:11:15 -0500 Subject: Flag all final types accordingly Part-of: --- proxy/environment/genvironmentproxyresolver.c | 12 ++++++------ proxy/gnome/gproxyresolvergnome.c | 2 +- proxy/libproxy/glibproxyresolver.c | 12 ++++++------ tls/base/gtlsinputstream.c | 6 +++--- tls/base/gtlsoutputstream.c | 6 +++--- tls/gnutls/gtlsbackend-gnutls.c | 2 +- tls/gnutls/gtlscertificate-gnutls.c | 6 +++--- tls/gnutls/gtlsclientconnection-gnutls.c | 14 +++++++------- tls/gnutls/gtlsfiledatabase-gnutls.c | 8 ++++---- tls/gnutls/gtlsserverconnection-gnutls.c | 14 +++++++------- tls/openssl/gtlsbackend-openssl.c | 2 +- tls/openssl/gtlscertificate-openssl.c | 6 +++--- tls/openssl/gtlsclientconnection-openssl.c | 14 +++++++------- tls/openssl/gtlsfiledatabase-openssl.c | 8 ++++---- tls/openssl/gtlsserverconnection-openssl.c | 14 +++++++------- tls/tests/lossy-socket.c | 10 +++++----- tls/tests/mock-interaction.c | 2 +- 17 files changed, 69 insertions(+), 69 deletions(-) diff --git a/proxy/environment/genvironmentproxyresolver.c b/proxy/environment/genvironmentproxyresolver.c index e70b3ba..d362d9e 100644 --- a/proxy/environment/genvironmentproxyresolver.c +++ b/proxy/environment/genvironmentproxyresolver.c @@ -42,15 +42,15 @@ g_environment_proxy_resolver_class_finalize (GEnvironmentProxyResolverClass *kla G_DEFINE_DYNAMIC_TYPE_EXTENDED (GEnvironmentProxyResolver, g_environment_proxy_resolver, - G_TYPE_OBJECT, 0, + G_TYPE_OBJECT, G_TYPE_FLAG_FINAL, G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_PROXY_RESOLVER, g_environment_proxy_resolver_iface_init)) #else -G_DEFINE_TYPE_EXTENDED (GEnvironmentProxyResolver, - g_environment_proxy_resolver, - G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (G_TYPE_PROXY_RESOLVER, - g_environment_proxy_resolver_iface_init)) +G_DEFINE_FINAL_TYPE_WITH_CODE (GEnvironmentProxyResolver, + g_environment_proxy_resolver, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (G_TYPE_PROXY_RESOLVER, + g_environment_proxy_resolver_iface_init)) #endif static gboolean diff --git a/proxy/gnome/gproxyresolvergnome.c b/proxy/gnome/gproxyresolvergnome.c index 9fd2f28..2ae6682 100644 --- a/proxy/gnome/gproxyresolvergnome.c +++ b/proxy/gnome/gproxyresolvergnome.c @@ -85,7 +85,7 @@ static void g_proxy_resolver_gnome_iface_init (GProxyResolverInterface *iface); G_DEFINE_DYNAMIC_TYPE_EXTENDED (GProxyResolverGnome, g_proxy_resolver_gnome, - G_TYPE_OBJECT, 0, + G_TYPE_OBJECT, G_TYPE_FLAG_FINAL, G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_PROXY_RESOLVER, g_proxy_resolver_gnome_iface_init)) diff --git a/proxy/libproxy/glibproxyresolver.c b/proxy/libproxy/glibproxyresolver.c index 3d84af5..b772800 100644 --- a/proxy/libproxy/glibproxyresolver.c +++ b/proxy/libproxy/glibproxyresolver.c @@ -47,15 +47,15 @@ g_libproxy_resolver_class_finalize (GLibproxyResolverClass *klass) G_DEFINE_DYNAMIC_TYPE_EXTENDED (GLibproxyResolver, g_libproxy_resolver, - G_TYPE_OBJECT, 0, + G_TYPE_OBJECT, G_TYPE_FLAG_FINAL, G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_PROXY_RESOLVER, g_libproxy_resolver_iface_init)) #else -G_DEFINE_TYPE_EXTENDED (GLibproxyResolver, - g_libproxy_resolver, - G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (G_TYPE_PROXY_RESOLVER, - g_libproxy_resolver_iface_init)) +G_DEFINE_FINAL_TYPE_WITH_CODE (GLibproxyResolver, + g_libproxy_resolver, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (G_TYPE_PROXY_RESOLVER, + g_libproxy_resolver_iface_init)) #endif static void diff --git a/tls/base/gtlsinputstream.c b/tls/base/gtlsinputstream.c index 4f7a84f..0928c22 100644 --- a/tls/base/gtlsinputstream.c +++ b/tls/base/gtlsinputstream.c @@ -36,9 +36,9 @@ struct _GTlsInputStream static void g_tls_input_stream_pollable_iface_init (GPollableInputStreamInterface *iface); -G_DEFINE_TYPE_WITH_CODE (GTlsInputStream, g_tls_input_stream, G_TYPE_INPUT_STREAM, - G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, g_tls_input_stream_pollable_iface_init) - ) +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsInputStream, g_tls_input_stream, G_TYPE_INPUT_STREAM, + G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, g_tls_input_stream_pollable_iface_init) + ) static void g_tls_input_stream_dispose (GObject *object) diff --git a/tls/base/gtlsoutputstream.c b/tls/base/gtlsoutputstream.c index 796a4cd..65fd521 100644 --- a/tls/base/gtlsoutputstream.c +++ b/tls/base/gtlsoutputstream.c @@ -36,9 +36,9 @@ struct _GTlsOutputStream static void g_tls_output_stream_pollable_iface_init (GPollableOutputStreamInterface *iface); -G_DEFINE_TYPE_WITH_CODE (GTlsOutputStream, g_tls_output_stream, G_TYPE_OUTPUT_STREAM, - G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_OUTPUT_STREAM, g_tls_output_stream_pollable_iface_init) - ) +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsOutputStream, g_tls_output_stream, G_TYPE_OUTPUT_STREAM, + G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_OUTPUT_STREAM, g_tls_output_stream_pollable_iface_init) + ) static void g_tls_output_stream_dispose (GObject *object) diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c index d5276cb..8f20322 100644 --- a/tls/gnutls/gtlsbackend-gnutls.c +++ b/tls/gnutls/gtlsbackend-gnutls.c @@ -46,7 +46,7 @@ struct _GTlsBackendGnutls static void g_tls_backend_gnutls_interface_init (GTlsBackendInterface *iface); -G_DEFINE_DYNAMIC_TYPE_EXTENDED (GTlsBackendGnutls, g_tls_backend_gnutls, G_TYPE_OBJECT, 0, +G_DEFINE_DYNAMIC_TYPE_EXTENDED (GTlsBackendGnutls, g_tls_backend_gnutls, G_TYPE_OBJECT, G_TYPE_FLAG_FINAL, G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_TLS_BACKEND, g_tls_backend_gnutls_interface_init);) diff --git a/tls/gnutls/gtlscertificate-gnutls.c b/tls/gnutls/gtlscertificate-gnutls.c index 45e68f7..682c17b 100644 --- a/tls/gnutls/gtlscertificate-gnutls.c +++ b/tls/gnutls/gtlscertificate-gnutls.c @@ -77,9 +77,9 @@ struct _GTlsCertificateGnutls static void g_tls_certificate_gnutls_initable_iface_init (GInitableIface *iface); static GTlsCertificateGnutls *g_tls_certificate_gnutls_new_take_x509 (gnutls_x509_crt_t cert); -G_DEFINE_TYPE_WITH_CODE (GTlsCertificateGnutls, g_tls_certificate_gnutls, G_TYPE_TLS_CERTIFICATE, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_tls_certificate_gnutls_initable_iface_init);) +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsCertificateGnutls, g_tls_certificate_gnutls, G_TYPE_TLS_CERTIFICATE, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_tls_certificate_gnutls_initable_iface_init);) static void g_tls_certificate_gnutls_finalize (GObject *object) diff --git a/tls/gnutls/gtlsclientconnection-gnutls.c b/tls/gnutls/gtlsclientconnection-gnutls.c index b22d733..79cd7a1 100644 --- a/tls/gnutls/gtlsclientconnection-gnutls.c +++ b/tls/gnutls/gtlsclientconnection-gnutls.c @@ -91,13 +91,13 @@ static int g_tls_client_connection_gnutls_handshake_thread_retrieve_function (gn static GInitableIface *g_tls_client_connection_gnutls_parent_initable_iface; -G_DEFINE_TYPE_WITH_CODE (GTlsClientConnectionGnutls, g_tls_client_connection_gnutls, G_TYPE_TLS_CONNECTION_GNUTLS, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_tls_client_connection_gnutls_initable_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, - g_tls_client_connection_gnutls_client_connection_interface_init); - G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_CLIENT_CONNECTION, - g_tls_client_connection_gnutls_dtls_client_connection_interface_init)); +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsClientConnectionGnutls, g_tls_client_connection_gnutls, G_TYPE_TLS_CONNECTION_GNUTLS, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_tls_client_connection_gnutls_initable_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, + g_tls_client_connection_gnutls_client_connection_interface_init); + G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_CLIENT_CONNECTION, + g_tls_client_connection_gnutls_dtls_client_connection_interface_init)); static void clear_gnutls_certificate_copy (gnutls_pcert_st **pcert, diff --git a/tls/gnutls/gtlsfiledatabase-gnutls.c b/tls/gnutls/gtlsfiledatabase-gnutls.c index d9a22f5..84bebd6 100644 --- a/tls/gnutls/gtlsfiledatabase-gnutls.c +++ b/tls/gnutls/gtlsfiledatabase-gnutls.c @@ -50,10 +50,10 @@ struct _GTlsFileDatabaseGnutls static void g_tls_file_database_gnutls_file_database_interface_init (GTlsFileDatabaseInterface *iface); -G_DEFINE_TYPE_WITH_CODE (GTlsFileDatabaseGnutls, g_tls_file_database_gnutls, G_TYPE_TLS_DATABASE_GNUTLS, - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_FILE_DATABASE, - g_tls_file_database_gnutls_file_database_interface_init); - ); +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsFileDatabaseGnutls, g_tls_file_database_gnutls, G_TYPE_TLS_DATABASE_GNUTLS, + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_FILE_DATABASE, + g_tls_file_database_gnutls_file_database_interface_init); + ); static void g_tls_file_database_gnutls_finalize (GObject *object) diff --git a/tls/gnutls/gtlsserverconnection-gnutls.c b/tls/gnutls/gtlsserverconnection-gnutls.c index 2530376..57461d6 100644 --- a/tls/gnutls/gtlsserverconnection-gnutls.c +++ b/tls/gnutls/gtlsserverconnection-gnutls.c @@ -66,13 +66,13 @@ static int g_tls_server_connection_gnutls_handshake_thread_retrieve_function (gn static GInitableIface *g_tls_server_connection_gnutls_parent_initable_iface; -G_DEFINE_TYPE_WITH_CODE (GTlsServerConnectionGnutls, g_tls_server_connection_gnutls, G_TYPE_TLS_CONNECTION_GNUTLS, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_tls_server_connection_gnutls_initable_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, - g_tls_server_connection_gnutls_server_connection_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_SERVER_CONNECTION, - NULL) +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsServerConnectionGnutls, g_tls_server_connection_gnutls, G_TYPE_TLS_CONNECTION_GNUTLS, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_tls_server_connection_gnutls_initable_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, + g_tls_server_connection_gnutls_server_connection_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_SERVER_CONNECTION, + NULL) ) static void diff --git a/tls/openssl/gtlsbackend-openssl.c b/tls/openssl/gtlsbackend-openssl.c index 23cd8de..4906536 100644 --- a/tls/openssl/gtlsbackend-openssl.c +++ b/tls/openssl/gtlsbackend-openssl.c @@ -47,7 +47,7 @@ struct _GTlsBackendOpenssl static void g_tls_backend_openssl_interface_init (GTlsBackendInterface *iface); -G_DEFINE_DYNAMIC_TYPE_EXTENDED (GTlsBackendOpenssl, g_tls_backend_openssl, G_TYPE_OBJECT, 0, +G_DEFINE_DYNAMIC_TYPE_EXTENDED (GTlsBackendOpenssl, g_tls_backend_openssl, G_TYPE_OBJECT, G_TYPE_FLAG_FINAL, G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_TLS_BACKEND, g_tls_backend_openssl_interface_init)) diff --git a/tls/openssl/gtlscertificate-openssl.c b/tls/openssl/gtlscertificate-openssl.c index ec81717..648f3e8 100644 --- a/tls/openssl/gtlscertificate-openssl.c +++ b/tls/openssl/gtlscertificate-openssl.c @@ -72,9 +72,9 @@ enum static void g_tls_certificate_openssl_initable_iface_init (GInitableIface *iface); static gboolean is_issuer (GTlsCertificateOpenssl *cert, GTlsCertificateOpenssl *issuer); -G_DEFINE_TYPE_WITH_CODE (GTlsCertificateOpenssl, g_tls_certificate_openssl, G_TYPE_TLS_CERTIFICATE, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_tls_certificate_openssl_initable_iface_init)) +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsCertificateOpenssl, g_tls_certificate_openssl, G_TYPE_TLS_CERTIFICATE, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_tls_certificate_openssl_initable_iface_init)) static void g_tls_certificate_openssl_finalize (GObject *object) diff --git a/tls/openssl/gtlsclientconnection-openssl.c b/tls/openssl/gtlsclientconnection-openssl.c index 6abf466..e98fb0b 100644 --- a/tls/openssl/gtlsclientconnection-openssl.c +++ b/tls/openssl/gtlsclientconnection-openssl.c @@ -71,13 +71,13 @@ static void g_tls_client_connection_openssl_client_connection_interface_init (GT static GInitableIface *g_tls_client_connection_openssl_parent_initable_iface; -G_DEFINE_TYPE_WITH_CODE (GTlsClientConnectionOpenssl, g_tls_client_connection_openssl, G_TYPE_TLS_CONNECTION_OPENSSL, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_tls_client_connection_openssl_initable_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, - g_tls_client_connection_openssl_client_connection_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_CLIENT_CONNECTION, - NULL)); +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsClientConnectionOpenssl, g_tls_client_connection_openssl, G_TYPE_TLS_CONNECTION_OPENSSL, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_tls_client_connection_openssl_initable_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, + g_tls_client_connection_openssl_client_connection_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_CLIENT_CONNECTION, + NULL)); static void g_tls_client_connection_openssl_finalize (GObject *object) diff --git a/tls/openssl/gtlsfiledatabase-openssl.c b/tls/openssl/gtlsfiledatabase-openssl.c index 7e2f928..a8ffa08 100644 --- a/tls/openssl/gtlsfiledatabase-openssl.c +++ b/tls/openssl/gtlsfiledatabase-openssl.c @@ -77,10 +77,10 @@ enum static void g_tls_file_database_openssl_file_database_interface_init (GTlsFileDatabaseInterface *iface); -G_DEFINE_TYPE_WITH_CODE (GTlsFileDatabaseOpenssl, g_tls_file_database_openssl, G_TYPE_TLS_DATABASE_OPENSSL, - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_FILE_DATABASE, - g_tls_file_database_openssl_file_database_interface_init) - ) +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsFileDatabaseOpenssl, g_tls_file_database_openssl, G_TYPE_TLS_DATABASE_OPENSSL, + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_FILE_DATABASE, + g_tls_file_database_openssl_file_database_interface_init) + ) static GHashTable * bytes_multi_table_new (void) diff --git a/tls/openssl/gtlsserverconnection-openssl.c b/tls/openssl/gtlsserverconnection-openssl.c index 3bfe198..2940897 100644 --- a/tls/openssl/gtlsserverconnection-openssl.c +++ b/tls/openssl/gtlsserverconnection-openssl.c @@ -53,13 +53,13 @@ static void g_tls_server_connection_openssl_server_connection_interface_init (GT static GInitableIface *g_tls_server_connection_openssl_parent_initable_iface; -G_DEFINE_TYPE_WITH_CODE (GTlsServerConnectionOpenssl, g_tls_server_connection_openssl, G_TYPE_TLS_CONNECTION_OPENSSL, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_tls_server_connection_openssl_initable_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, - g_tls_server_connection_openssl_server_connection_interface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_SERVER_CONNECTION, - NULL)); +G_DEFINE_FINAL_TYPE_WITH_CODE (GTlsServerConnectionOpenssl, g_tls_server_connection_openssl, G_TYPE_TLS_CONNECTION_OPENSSL, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_tls_server_connection_openssl_initable_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, + g_tls_server_connection_openssl_server_connection_interface_init) + G_IMPLEMENT_INTERFACE (G_TYPE_DTLS_SERVER_CONNECTION, + NULL)); static void g_tls_server_connection_openssl_finalize (GObject *object) diff --git a/tls/tests/lossy-socket.c b/tls/tests/lossy-socket.c index 7c20708..f4db6f6 100644 --- a/tls/tests/lossy-socket.c +++ b/tls/tests/lossy-socket.c @@ -39,11 +39,11 @@ struct _LossySocket static void lossy_socket_datagram_based_iface_init (GDatagramBasedInterface *iface); -G_DEFINE_TYPE_EXTENDED (LossySocket, - lossy_socket, - G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (G_TYPE_DATAGRAM_BASED, - lossy_socket_datagram_based_iface_init)) +G_DEFINE_FINAL_TYPE_WITH_CODE (LossySocket, + lossy_socket, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (G_TYPE_DATAGRAM_BASED, + lossy_socket_datagram_based_iface_init)) static gint lossy_socket_receive_messages (GDatagramBased *datagram_based, diff --git a/tls/tests/mock-interaction.c b/tls/tests/mock-interaction.c index 7714be6..9771194 100644 --- a/tls/tests/mock-interaction.c +++ b/tls/tests/mock-interaction.c @@ -38,7 +38,7 @@ struct _MockInteraction GError *static_error; }; -G_DEFINE_TYPE (MockInteraction, mock_interaction, G_TYPE_TLS_INTERACTION); +G_DEFINE_FINAL_TYPE (MockInteraction, mock_interaction, G_TYPE_TLS_INTERACTION); static void mock_interaction_ask_password_async (GTlsInteraction *interaction, -- cgit v1.2.1