[libsoup] soup-server: remove a useless check
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] soup-server: remove a useless check
- Date: Sun, 1 Mar 2015 15:38:41 +0000 (UTC)
commit 4a03b2e8104ff671bb8eb5baefb6047cce513bbf
Author: Dan Winship <danw gnome org>
Date: Tue Dec 30 14:38:45 2014 -0500
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.
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 c55d971..1fe817b 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]