updated checkpatch.pl

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f5ff0b3..ae63a1e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,22 +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 <getopt.h>
@@ -75,11 +74,12 @@ static const char *program_name;
 static void print_version()
 {
        printf("psensor %s\n", VERSION);
-       printf(_("Copyright (C) %s jeanfi@gmail.com\n\
-License GPLv2: GNU GPL version 2 or later \
-<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"),
+       printf(_("Copyright (C) %s jeanfi@gmail.com\n"
+                "License GPLv2: GNU GPL version 2 or later "
+                "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+                "This is free software: you are free to change and "
+                " redistribute it.\n"
+                "There is NO WARRANTY, to the extent permitted by law.\n"),
               "2010-2011");
 }
 
@@ -92,15 +92,18 @@ static void print_help()
 
        puts("");
        puts(_("Options:"));
-       puts(_("\
-  -h, --help          display this help and exit\n\
-  -v, --version       display version information and exit"));
+       puts(_("  -h, --help          display this help and exit\n"
+              "  -v, --version       display version information and exit"));
 
        puts("");
 
-       puts(_("\
-  -u, --url=URL       \
-the URL of the psensor-server, example: http://hostname:3131"));
+       puts(_("  -u, --url=URL       "
+              "the URL of the psensor-server, example: http://hostname:3131"));
+
+       puts("");
+
+       puts(_("  -d, --debug=LEVEL   "
+              "set the debug level, integer between 0 and 3"));
 
        puts("");
 
@@ -134,7 +137,7 @@ static void log_measures(struct psensor **sensors)
 {
        if (log_level == LOG_DEBUG)
                while (*sensors) {
-                       log_printf(LOG_DEBUG, "Measure: %s %.2f",
+                       log_debug("Measure: %s %.2f",
                                   (*sensors)->name,
                                   psensor_get_current_value(*sensors));
 
@@ -347,7 +350,7 @@ static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"url", required_argument, 0, 'u'},
-       {"debug", no_argument, 0, 'd'},
+       {"debug", required_argument, 0, 'd'},
        {0, 0, 0, 0}
 };
 
@@ -355,16 +358,14 @@ static gboolean initial_window_show(gpointer data)
 {
        struct ui_psensor *ui;
 
-       log_printf(LOG_DEBUG, "initial_window_show()");
+       log_debug("initial_window_show()");
 
        ui = (struct ui_psensor *)data;
 
-       log_printf(LOG_DEBUG,
-                  "is_status_supported: %d", is_status_supported());
-       log_printf(LOG_DEBUG,
-                  "is_appindicator_supported: %d", is_appindicator_supported());
-       log_printf(LOG_DEBUG,
-                  "hide_on_startup: %d", ui->config->hide_on_startup);
+       log_debug("is_status_supported: %d", is_status_supported());
+       log_debug("is_appindicator_supported: %d",
+                  is_appindicator_supported());
+       log_debug("hide_on_startup: %d", ui->config->hide_on_startup);
 
        if (!ui->config->hide_on_startup
            || (!is_appindicator_supported() && !is_status_supported()))
@@ -393,7 +394,7 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
 #endif
 
-       while ((optc = getopt_long(argc, argv, "vhdu:", long_options,
+       while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
                                   NULL)) != -1) {
                switch (optc) {
                case 'u':
@@ -408,7 +409,7 @@ int main(int argc, char **argv)
                        exit(EXIT_SUCCESS);
                case 'd':
                        printf(_("Enables debug mode.\n"));
-                       log_level = LOG_DEBUG;
+                       log_level = atoi(optarg);
                        break;
                default:
                        cmdok = 0;
@@ -464,7 +465,9 @@ int main(int argc, char **argv)
        associate_colors(ui.sensors);
        associate_cb_alarm_raised(ui.sensors, &ui);
 
+#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
        ui_status_init(&ui);
+#endif
 
        /* main window */
        ui_window_create(&ui);