diff options
author | Dan Winship <danw@gnome.org> | 2014-12-30 14:38:45 -0500 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2015-02-27 17:56:11 -0500 |
commit | 85f9b37762ba360849b0a80d188c5d1fafbb9601 (patch) | |
tree | fb25b29934e1d65df3f07a458d8046fa2e05c6d8 | |
parent | 306bc0333321cc2725ea6cb228d06448acaad87d (diff) | |
download | libsoup-85f9b37762ba360849b0a80d188c5d1fafbb9601.tar.gz |
soup-server: remove a useless check
soup_server_add_handler() asserts that the callback is non-NULL, so we
don't need to check that later.
-rw-r--r-- | libsoup/soup-server.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c index 4e60aa68..b6c4dc47 100644 --- a/libsoup/soup-server.c +++ b/libsoup/soup-server.c @@ -1239,6 +1239,7 @@ call_handler (SoupMessage *msg, SoupClientContext *client) SoupServerPrivate *priv = SOUP_SERVER_GET_PRIVATE (server); SoupServerHandler *handler; SoupURI *uri; + GHashTable *form_data_set; g_signal_emit (server, signals[REQUEST_READ], 0, msg, client); @@ -1252,22 +1253,18 @@ call_handler (SoupMessage *msg, SoupClientContext *client) return; } - if (handler->callback) { - GHashTable *form_data_set; - - if (uri->query) - form_data_set = soup_form_decode (uri->query); - else - form_data_set = NULL; + if (uri->query) + form_data_set = soup_form_decode (uri->query); + else + form_data_set = NULL; - /* Call method handler */ - (*handler->callback) (server, msg, - uri->path, form_data_set, - client, handler->user_data); + /* Call method handler */ + (*handler->callback) (server, msg, + uri->path, form_data_set, + client, handler->user_data); - if (form_data_set) - g_hash_table_unref (form_data_set); - } + if (form_data_set) + g_hash_table_unref (form_data_set); } static void |