projects / psensor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
updated to new version of checkpatch.pl
[psensor.git] / src / server / server.c
diff --git a/src/server/server.c b/src/server/server.c
index 32b3cfd..25e4d27 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -48,6 +48,9 @@
 
 static const char *DEFAULT_LOG_FILE = "/var/log/psensor-server.log";
 
+#define HTML_STOP_REQUESTED \
+(_("<html><body><p>Server stop requested</p></body></html>"))
+
 static const char *program_name;
 
 #define DEFAULT_PORT 3131
@@ -86,8 +89,8 @@ void print_help()
 {
        printf(_("Usage: %s [OPTION]...\n"), program_name);
 
-       puts(_("psensor-server is an HTTP server "
-              "for monitoring hardware sensors remotely."));
+       puts(_("psensor-server is an HTTP server for monitoring hardware "
+              "sensors remotely."));
 
        puts("");
        puts("Options:");
@@ -99,10 +102,9 @@ void print_help()
               "  -w,--wdir=DIR         directory containing webserver pages"));
 
        puts("");
-       puts(_("  -d, --debug=LEVEL   "
+       puts(_("  -d, --debug=LEVEL     "
               "set the debug level, integer between 0 and 3"));
-       puts(_("  -l, --log-file=PATH "
-              "set the log file to PATH"));
+       puts(_("  -l, --log-file=PATH   set the log file to PATH"));
 
        puts("");
        printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT);
@@ -176,8 +178,7 @@ create_response_api(const char *nurl,
        } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) {
 
                server_stop_requested = 1;
-               page = strdup(_("<html><body><p>"
-                               "Server stop requested</p></body></html>"));
+               page = strdup(HTML_STOP_REQUESTED);
        }
 
        if (page) {
@@ -227,7 +228,7 @@ create_response_file(const char *nurl,
                                 (MHD_ContentReaderFreeCallback)&fclose);
 
                } else {
-                       log_printf(LOG_ERR, "Failed to open: %s\n", fpath);
+                       log_err("Failed to open: %s.", fpath);
                }
        }
 
@@ -383,14 +384,14 @@ int main(int argc, char *argv[])
 #endif
 
        if (!*server_data.sensors)
-               fprintf(stderr, _("ERROR: no sensors detected\n"));
+               log_err(_("No sensors detected."));
 
        d = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION,
                             port,
                             NULL, NULL, &cbk_http_request, server_data.sensors,
                             MHD_OPTION_END);
        if (!d) {
-               fprintf(stderr, _("ERROR: Fail to create web server\n"));
+               log_err(_("Failed to create Web server."));
                exit(EXIT_FAILURE);
        }
 
psensor