summaryrefslogtreecommitdiff
path: root/httpd.c
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2010-08-16 02:56:52 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2010-08-16 02:56:52 +0200
commit43136cc7bfb9a44db2800fdfb360e08e36e6f7c2 (patch)
tree1789244540069b47a6a4d3d44e8f2b11c70d88ee /httpd.c
parent9510dcdf4d03a69da1398bc408fb937485c3c76f (diff)
Fixed error handling in httpd and commands.
Diffstat (limited to 'httpd.c')
-rw-r--r--httpd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/httpd.c b/httpd.c
index 44f7109..074bd69 100644
--- a/httpd.c
+++ b/httpd.c
@@ -16,7 +16,7 @@ static gboolean service_incoming(GSocketService *service,
socket = g_socket_connection_get_socket(connection);
if(socket == NULL) {
- g_error("g_socket_connection_get_socket() returned NULL");
+ g_warning("g_socket_connection_get_socket() returned NULL");
return FALSE;
}
@@ -28,8 +28,9 @@ static gboolean service_incoming(GSocketService *service,
gchar buffer[0x400];
gssize len = g_socket_receive(socket, buffer, 0x400, NULL, &error);
if(len == -1) {
- g_error(error->message);
+ g_warning(error->message);
g_error_free(error);
+ g_string_free(string, TRUE);
return FALSE;
}
tot += len;
@@ -68,9 +69,8 @@ static gboolean service_incoming(GSocketService *service,
commands_handle(connection, path);
if(g_socket_close(socket, &error) == FALSE) {
- g_error(error->message);
+ g_warning(error->message);
g_error_free(error);
- return FALSE;
}
return FALSE;