diff options
author | Dan Winship <danw@gnome.org> | 2014-12-07 12:37:16 +0100 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2015-02-27 17:56:11 -0500 |
commit | cbfd19ed77384d09aacc2d7efee75b7dba1d4113 (patch) | |
tree | 514fe4c6adc58ccb0591609d43157bb3abfc7fbc /libsoup/soup-server.c | |
parent | f542e8512784fd899d9d1337c597d56e4cf5314f (diff) | |
download | libsoup-cbfd19ed77384d09aacc2d7efee75b7dba1d4113.tar.gz |
soup-server: don't use "hand" as an abbreviation for "handler"
Diffstat (limited to 'libsoup/soup-server.c')
-rw-r--r-- | libsoup/soup-server.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c index f2dcc136..cd630674 100644 --- a/libsoup/soup-server.c +++ b/libsoup/soup-server.c @@ -162,12 +162,12 @@ static SoupClientContext *soup_client_context_ref (SoupClientContext *client); static void soup_client_context_unref (SoupClientContext *client); static void -free_handler (SoupServerHandler *hand) +free_handler (SoupServerHandler *handler) { - g_free (hand->path); - if (hand->destroy) - hand->destroy (hand->user_data); - g_slice_free (SoupServerHandler, hand); + g_free (handler->path); + if (handler->destroy) + handler->destroy (handler->user_data); + g_slice_free (SoupServerHandler, handler); } static void @@ -1155,15 +1155,15 @@ static SoupServerHandler * soup_server_get_handler (SoupServer *server, const char *path) { SoupServerPrivate *priv; - SoupServerHandler *hand; + SoupServerHandler *handler; g_return_val_if_fail (SOUP_IS_SERVER (server), NULL); priv = SOUP_SERVER_GET_PRIVATE (server); if (path) { - hand = soup_path_map_lookup (priv->handlers, path); - if (hand) - return hand; + handler = soup_path_map_lookup (priv->handlers, path); + if (handler) + return handler; if (!strcmp (path, "*")) return NULL; } @@ -1251,7 +1251,7 @@ static void call_handler (SoupMessage *msg, SoupClientContext *client) { SoupServer *server = client->server; - SoupServerHandler *hand; + SoupServerHandler *handler; SoupURI *uri; g_signal_emit (server, signals[REQUEST_READ], 0, msg, client); @@ -1260,13 +1260,13 @@ call_handler (SoupMessage *msg, SoupClientContext *client) return; uri = soup_message_get_uri (msg); - hand = soup_server_get_handler (server, uri->path); - if (!hand) { + handler = soup_server_get_handler (server, uri->path); + if (!handler) { soup_message_set_status (msg, SOUP_STATUS_NOT_FOUND); return; } - if (hand->callback) { + if (handler->callback) { GHashTable *form_data_set; if (uri->query) @@ -1275,9 +1275,9 @@ call_handler (SoupMessage *msg, SoupClientContext *client) form_data_set = NULL; /* Call method handler */ - (*hand->callback) (server, msg, - uri->path, form_data_set, - client, hand->user_data); + (*handler->callback) (server, msg, + uri->path, form_data_set, + client, handler->user_data); if (form_data_set) g_hash_table_unref (form_data_set); @@ -2339,7 +2339,7 @@ soup_server_add_handler (SoupServer *server, GDestroyNotify destroy) { SoupServerPrivate *priv; - SoupServerHandler *hand; + SoupServerHandler *handler; g_return_if_fail (SOUP_IS_SERVER (server)); g_return_if_fail (callback != NULL); @@ -2352,17 +2352,17 @@ soup_server_add_handler (SoupServer *server, if (path && (!*path || !strcmp (path, "/"))) path = NULL; - hand = g_slice_new0 (SoupServerHandler); - hand->path = g_strdup (path); - hand->callback = callback; - hand->destroy = destroy; - hand->user_data = user_data; + handler = g_slice_new0 (SoupServerHandler); + handler->path = g_strdup (path); + handler->callback = callback; + handler->destroy = destroy; + handler->user_data = user_data; soup_server_remove_handler (server, path); if (path) - soup_path_map_add (priv->handlers, path, hand); + soup_path_map_add (priv->handlers, path, handler); else - priv->default_handler = hand; + priv->default_handler = handler; } /** |