Update the Joyent http_parser.c to version 2.0, cleanup code accordingly

[deb_shairplay.git] / src / lib / raop.c

diff --git a/src/lib/raop.c b/src/lib/raop.c
index fd02edfebfdd1a1534dc3978be98071e089e0ee7..abf66300e6081a7db3b3a1840027c937475510d4 100644 (file)
--- a/src/lib/raop.c
+++ b/src/lib/raop.c
@@ -349,7 +349,7 @@ conn_destroy(void *ptr)
 }
 
 raop_t *
-raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey)
+raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey, int *error)
 {
        raop_t *raop;
        httpd_t *httpd;
@@ -390,7 +390,7 @@ raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey)
        httpd_cbs.conn_destroy = &conn_destroy;
 
        /* Initialize the http daemon */
-       httpd = httpd_init(raop->logger, &httpd_cbs, max_clients, 1);
+       httpd = httpd_init(raop->logger, &httpd_cbs, max_clients);
        if (!httpd) {
                free(raop);
                return NULL;
@@ -414,7 +414,7 @@ raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey)
 }
 
 raop_t *
-raop_init_from_keyfile(int max_clients, raop_callbacks_t *callbacks, const char *keyfile)
+raop_init_from_keyfile(int max_clients, raop_callbacks_t *callbacks, const char *keyfile, int *error)
 {
        raop_t *raop;
        char *pemstr;
@@ -422,7 +422,7 @@ raop_init_from_keyfile(int max_clients, raop_callbacks_t *callbacks, const char
        if (utils_read_file(&pemstr, keyfile) < 0) {
                return NULL;
        }
-       raop = raop_init(max_clients, callbacks, pemstr);
+       raop = raop_init(max_clients, callbacks, pemstr, error);
        free(pemstr);
        return raop;
 }
@@ -460,11 +460,11 @@ raop_set_log_level(raop_t *raop, int level)
 }
 
 void
-raop_set_log_callback(raop_t *raop, raop_log_callback_t callback)
+raop_set_log_callback(raop_t *raop, raop_log_callback_t callback, void *cls)
 {
        assert(raop);
 
-       logger_set_callback(raop->logger, callback);
+       logger_set_callback(raop->logger, callback, cls);
 }
 
 int