fixed compilation issue with microhttpd

[psensor.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index b00f8ae..cdd655d 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -1,21 +1,21 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
+ * Copyright (C) 2010-2011 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include <locale.h>
 #include <libintl.h>
 #define _(str) gettext(str)
@@ -42,8 +42,8 @@
 #endif
 
 #include "psensor_json.h"
-#include "plib/url.h"
-#include "plib/plib_io.h"
+#include "url.h"
+#include "p_io.h"
 #include "server.h"
 
 static const char *program_name;
@@ -92,15 +92,15 @@ void print_help()
        puts("");
        puts("Options:");
        puts(_("\
-  -h, --help          display this help and exit\n\
-  -v, --version       display version information and exit"));
+  -h, --help           display this help and exit\n\
+  -v, --version                display version information and exit"));
 
        puts("");
 
        puts(_("\
-  -d,--debug     run in debug mode\n\
-  -p,--port=PORT webserver port\n\
-  -w,--wdir=DIR  directory containing webserver pages"));
+  -d,--debug           run in debug mode\n\
+  -p,--port=PORT       webserver port\n\
+  -w,--wdir=DIR                directory containing webserver pages"));
 
        puts("");
 
@@ -131,7 +131,7 @@ char *get_path(const char *url, const char *www_dir)
 }
 
 #if MHD_VERSION >= 0x00090200
-static int
+static ssize_t
 file_reader(void *cls, uint64_t pos, char *buf, size_t max)
 #else
 static int
@@ -375,9 +375,9 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       printf(_("Web server started on port: %d\n"), port);
-       printf(_("WWW directory: %s\n"), server_data.www_dir);
-       printf(_("URL: http://localhost:%d\n"), port);
+       log_printf(LOG_INFO, _("Web server started on port: %d"), port);
+       log_printf(LOG_INFO, _("WWW directory: %s"), server_data.www_dir);
+       log_printf(LOG_INFO, _("URL: http://localhost:%d"), port);
 
        while (!server_stop_requested) {
                pthread_mutex_lock(&mutex);