projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ff/netlib'
[collectd.git]
/
src
/
sensors.c
diff --git
a/src/sensors.c
b/src/sensors.c
index
7c1566c
..
209482e
100644
(file)
--- a/
src/sensors.c
+++ b/
src/sensors.c
@@
-153,7
+153,7
@@
typedef struct featurelist
# ifndef SENSORS_CONF_PATH
# define SENSORS_CONF_PATH "/etc/sensors.conf"
# endif
# ifndef SENSORS_CONF_PATH
# define SENSORS_CONF_PATH "/etc/sensors.conf"
# endif
-static c
onst c
har *conffile = SENSORS_CONF_PATH;
+static char *conffile = SENSORS_CONF_PATH;
/* #endif SENSORS_API_VERSION < 0x400 */
#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
/* #endif SENSORS_API_VERSION < 0x400 */
#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
@@
-165,7
+165,7
@@
typedef struct featurelist
struct featurelist *next;
} featurelist_t;
struct featurelist *next;
} featurelist_t;
-static c
onst c
har *conffile = NULL;
+static char *conffile = NULL;
/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
#else /* if SENSORS_API_VERSION >= 0x500 */
/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
#else /* if SENSORS_API_VERSION >= 0x500 */
@@
-297,7
+297,7
@@
static int sensors_load_conf (void)
call_once = 1;
call_once = 1;
- if (conffile)
+ if (conffile
!= NULL
)
{
fh = fopen (conffile, "r");
if (fh == NULL)
{
fh = fopen (conffile, "r");
if (fh == NULL)