diff options
author | Patrick Griffis <pgriffis@igalia.com> | 2020-10-21 16:43:22 -0500 |
---|---|---|
committer | Patrick Griffis <pgriffis@igalia.com> | 2020-10-21 16:43:22 -0500 |
commit | 06b2a619bbf1e2c619b96b655093d406469d58e4 (patch) | |
tree | 0bb1b22b53f7f33df1c36dd155ba91ed58a54e64 | |
parent | b5024563c92d8dd4802d0458e176a8114fee6ac8 (diff) | |
download | libsoup-06b2a619bbf1e2c619b96b655093d406469d58e4.tar.gz |
Consistently use G_DEFINE_QUARK
As well as rename soup_websocket_error_get_quark() to follow convention.
-rw-r--r-- | docs/reference/libsoup-3.0-sections.txt | 2 | ||||
-rw-r--r-- | libsoup/cookies/soup-cookie.c | 5 | ||||
-rw-r--r-- | libsoup/soup-session.c | 9 | ||||
-rw-r--r-- | libsoup/soup-tld.c | 9 | ||||
-rw-r--r-- | libsoup/websocket/soup-websocket.c | 6 | ||||
-rw-r--r-- | libsoup/websocket/soup-websocket.h | 4 |
6 files changed, 9 insertions, 26 deletions
diff --git a/docs/reference/libsoup-3.0-sections.txt b/docs/reference/libsoup-3.0-sections.txt index 64989b04..16e996af 100644 --- a/docs/reference/libsoup-3.0-sections.txt +++ b/docs/reference/libsoup-3.0-sections.txt @@ -1153,7 +1153,7 @@ soup_websocket_close_code_get_type soup_websocket_connection_get_type soup_websocket_connection_type_get_type soup_websocket_data_type_get_type -soup_websocket_error_get_quark +soup_websocket_error_quark soup_websocket_error_get_type soup_websocket_state_get_type </SECTION> diff --git a/libsoup/cookies/soup-cookie.c b/libsoup/cookies/soup-cookie.c index 71540bd8..c243d84c 100644 --- a/libsoup/cookies/soup-cookie.c +++ b/libsoup/cookies/soup-cookie.c @@ -777,8 +777,9 @@ serialize_cookie (SoupCookie *cookie, GString *header, gboolean set_cookie) g_string_append (header, "; HttpOnly"); } -static const char *same_site_policy_string = "soup-same-site-policy"; -#define SAME_SITE_POLICY_QUARK (g_quark_from_static_string (same_site_policy_string)) +static GQuark soup_same_site_policy_quark (void); +G_DEFINE_QUARK (soup-same-site-policy, soup_same_site_policy) +#define SAME_SITE_POLICY_QUARK (soup_same_site_policy_quark()) /** * soup_cookie_set_same_site_policy: diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index d336a62d..cb92337f 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -3923,14 +3923,7 @@ soup_session_request_http_uri (SoupSession *session, * Since: 2.42 */ -GQuark -soup_request_error_quark (void) -{ - static GQuark error; - if (!error) - error = g_quark_from_static_string ("soup_request_error_quark"); - return error; -} +G_DEFINE_QUARK (soup-request-error-quark, soup_request_error) static GIOStream * steal_connection (SoupSession *session, diff --git a/libsoup/soup-tld.c b/libsoup/soup-tld.c index 9025c293..b9a5436e 100644 --- a/libsoup/soup-tld.c +++ b/libsoup/soup-tld.c @@ -131,14 +131,7 @@ soup_tld_domain_is_public_suffix (const char *domain) * Since: 2.40 */ -GQuark -soup_tld_error_quark (void) -{ - static GQuark error; - if (!error) - error = g_quark_from_static_string ("soup_tld_error_quark"); - return error; -} +G_DEFINE_QUARK (soup-tld-error-quark, soup_tld_error) static const char * soup_tld_get_base_domain_internal (const char *hostname, GError **error) diff --git a/libsoup/websocket/soup-websocket.c b/libsoup/websocket/soup-websocket.c index 48f9a7bd..3ef71759 100644 --- a/libsoup/websocket/soup-websocket.c +++ b/libsoup/websocket/soup-websocket.c @@ -155,11 +155,7 @@ * Since: 2.50 */ -GQuark -soup_websocket_error_get_quark (void) -{ - return g_quark_from_static_string ("web-socket-error-quark"); -} +G_DEFINE_QUARK (soup-websocket-error-quark, soup_websocket_error) static gboolean validate_key (const char *key) diff --git a/libsoup/websocket/soup-websocket.h b/libsoup/websocket/soup-websocket.h index d347c213..c447b664 100644 --- a/libsoup/websocket/soup-websocket.h +++ b/libsoup/websocket/soup-websocket.h @@ -24,9 +24,9 @@ G_BEGIN_DECLS -#define SOUP_WEBSOCKET_ERROR (soup_websocket_error_get_quark ()) +#define SOUP_WEBSOCKET_ERROR (soup_websocket_error_quark ()) SOUP_AVAILABLE_IN_2_50 -GQuark soup_websocket_error_get_quark (void) G_GNUC_CONST; +GQuark soup_websocket_error_quark (void) G_GNUC_CONST; typedef enum { SOUP_WEBSOCKET_ERROR_FAILED, |