From 6457c46897d6e0c63476bf4ba4ca14b4844fac0d Mon Sep 17 00:00:00 2001 From: m0gg Date: Thu, 23 Nov 2006 15:27:32 +0000 Subject: Code cleanup --- examples/nanohttp/http_client.c | 4 +--- examples/nanohttp/http_server.c | 40 +++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 24 deletions(-) (limited to 'examples/nanohttp') diff --git a/examples/nanohttp/http_client.c b/examples/nanohttp/http_client.c index 4fa5bed..f871739 100644 --- a/examples/nanohttp/http_client.c +++ b/examples/nanohttp/http_client.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: http_client.c,v 1.4 2006/11/21 20:59:02 m0gg Exp $ +* $Id: http_client.c,v 1.5 2006/11/23 15:27:33 m0gg Exp $ * * CSOAP Project: A http client/server library in C (example) * Copyright (C) 2003-2004 Ferhat Ayaz @@ -24,10 +24,8 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/examples/nanohttp/http_server.c b/examples/nanohttp/http_server.c index 420c32f..950a717 100644 --- a/examples/nanohttp/http_server.c +++ b/examples/nanohttp/http_server.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: http_server.c,v 1.6 2006/11/21 20:59:02 m0gg Exp $ +* $Id: http_server.c,v 1.7 2006/11/23 15:27:33 m0gg Exp $ * * CSOAP Project: A http client/server library in C (example) * Copyright (C) 2003 Ferhat Ayaz @@ -23,17 +23,15 @@ ******************************************************************/ #include #include -#include #include -#include #include #include #include #include #include -static int simple_authenticator(hrequest_t *req, const char *user, const char *password) +static int simple_authenticator(struct hrequest_t *req, const char *user, const char *password) { log_info3("logging in user=\"%s\" password=\"%s\"", user, password); @@ -53,11 +51,11 @@ static int simple_authenticator(hrequest_t *req, const char *user, const char *p return 1; } -static void secure_service(httpd_conn_t *conn, hrequest_t *req) +static void secure_service(httpd_conn_t *conn, struct hrequest_t *req) { httpd_send_header(conn, 200, "OK"); - hsocket_send(conn->sock, + http_output_stream_write_string(conn->out, "" "" "Secure ressource!" @@ -70,11 +68,11 @@ static void secure_service(httpd_conn_t *conn, hrequest_t *req) return; } -static void default_service(httpd_conn_t *conn, hrequest_t *req) +static void default_service(httpd_conn_t *conn, struct hrequest_t *req) { httpd_send_header(conn, 404, "Not found"); - hsocket_send(conn->sock, + http_output_stream_write_string(conn->out, "" "" "Default error page" @@ -83,9 +81,9 @@ static void default_service(httpd_conn_t *conn, hrequest_t *req) "

Default error page

" "
"); - hsocket_send(conn->sock, req->path); + http_output_stream_write_string(conn->out, req->path); - hsocket_send(conn->sock, " can not be found" + http_output_stream_write_string(conn->out, " can not be found" "
" "" ""); @@ -93,12 +91,12 @@ static void default_service(httpd_conn_t *conn, hrequest_t *req) return; } -static void headers_service(httpd_conn_t *conn, hrequest_t *req) +static void headers_service(httpd_conn_t *conn, struct hrequest_t *req) { hpair_t *walker; httpd_send_header(conn, 200, "OK"); - hsocket_send(conn->sock, + http_output_stream_write_string(conn->out, "" "" "Request headers" @@ -109,14 +107,14 @@ static void headers_service(httpd_conn_t *conn, hrequest_t *req) for (walker=req->header; walker; walker=walker->next) { - hsocket_send(conn->sock, "
  • "); - hsocket_send(conn->sock, walker->key); - hsocket_send(conn->sock, " = "); - hsocket_send(conn->sock, walker->value); - hsocket_send(conn->sock, "
    • "); + http_output_stream_write_string(conn->out, "
  • "); + http_output_stream_write_string(conn->out, walker->key); + http_output_stream_write_string(conn->out, " = "); + http_output_stream_write_string(conn->out, walker->value); + http_output_stream_write_string(conn->out, "
    • "); } - hsocket_send(conn->sock, + http_output_stream_write_string(conn->out, "" "" ""); @@ -124,10 +122,10 @@ static void headers_service(httpd_conn_t *conn, hrequest_t *req) return; } -static void root_service(httpd_conn_t *conn, hrequest_t *req) +static void root_service(httpd_conn_t *conn, struct hrequest_t *req) { httpd_send_header(conn, 200, "OK"); - hsocket_send(conn->sock, + http_output_stream_write_string(conn->out, "" "" "nanoHTTP server examples" @@ -147,7 +145,7 @@ static void root_service(httpd_conn_t *conn, hrequest_t *req) return; } -int main(int argc, char *argv[]) +int main(int argc, char **argv) { hlog_set_level(HLOG_INFO); -- cgit v1.1-32-gdbae