use log_err instead of printf, improved messages

[psensor.git] / src / lib / lmsensor.c

diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c
index 48850f1..165a0ea 100644 (file)
--- a/src/lib/lmsensor.c
+++ b/src/lib/lmsensor.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-2012 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)
@@ -40,8 +39,7 @@ static double get_value(const sensors_chip_name *name,
 
        err = sensors_get_value(name, sub->number, &val);
        if (err) {
-               fprintf(stderr,
-                       _("ERROR: Can't get value of subfeature %s: %s\n"),
+               log_err(_("lmsensor: cannot get value of subfeature %s: %s."),
                        sub->name, sensors_strerror(err));
                val = UNKNOWN_DBL_VALUE;
        }
@@ -122,8 +120,8 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
                fault_subfeature = SENSORS_SUBFEATURE_FAN_FAULT;
 
        } else {
-               fprintf(stderr,
-                       _("ERROR: create_sensor, wrong feature type\n"));
+               log_err(_("lmsensor: lmsensor_psensor_create failure:"
+                         " wrong feature type."));
                return NULL;
        }
 
@@ -172,7 +170,7 @@ struct psensor **lmsensor_psensor_list_add(struct psensor **sensors,
        int i;
 
        if (!init_done)
-               return ;
+               return NULL;
 
        result = sensors;
        while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
@@ -205,8 +203,7 @@ void lmsensor_init()
        int err = sensors_init(NULL);
 
        if (err) {
-               fprintf(stderr,
-                       _("ERROR: lm-sensors initialization failure: %s\n"),
+               log_err(_("lmsensor: initialization failure: %s."),
                        sensors_strerror(err));
                init_done = 0;
        } else {