diff --git a/prog/sensord/args.c b/prog/sensord/args.c index b9b7793a..011348f2 100644 --- a/prog/sensord/args.c +++ b/prog/sensord/args.c @@ -257,13 +257,13 @@ int parseArgs(int argc, char **argv) "Error: Incompatible --set and --alarm-scan.\n"); return -1; } - + if (rrdFile && doSet) { fprintf(stderr, "Error: Incompatible --set and --rrd-file.\n"); return -1; } - + if (doScan && rrdFile) { fprintf(stderr, "Error: Incompatible --rrd-file and --alarm-scan.\n"); @@ -275,13 +275,13 @@ int parseArgs(int argc, char **argv) "Error: Incompatible --rrd-cgi without --rrd-file.\n"); return -1; } - + if (rrdFile && !rrdTime) { fprintf(stderr, "Error: Incompatible --rrd-file without --rrd-interval.\n"); return -1; } - + if (!logTime && !scanTime && !rrdFile) { fprintf(stderr, "Error: No logging, alarm or RRD scanning.\n"); diff --git a/prog/sensord/chips.c b/prog/sensord/chips.c index dc7a513f..75262e1b 100644 --- a/prog/sensord/chips.c +++ b/prog/sensord/chips.c @@ -157,7 +157,7 @@ static void fillChipVoltage(FeatureDescriptor *voltage, } else { voltage->format = fmtVolt_2; } - + /* terminate the list */ voltage->dataNumbers[pos] = -1; @@ -213,7 +213,7 @@ static void fillChipTemperature(FeatureDescriptor *temperature, } else { temperature->format = fmtTemp_only; } - + /* terminate the list */ temperature->dataNumbers[pos] = -1; @@ -265,7 +265,7 @@ static void fillChipFan(FeatureDescriptor *fan, } else { fan->format = fmtFan_only; } - + /* terminate the list */ fan->dataNumbers[pos] = -1; diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c index 56298d45..11f1e3cb 100644 --- a/prog/sensord/rrd.c +++ b/prog/sensord/rrd.c @@ -23,7 +23,7 @@ /* * RRD is the Round Robin Database - * + * * Get this package from: * http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ * @@ -87,7 +87,7 @@ static void rrdCheckLabel(const char *rawLabel, int index0) { char *buffer = rrdLabels[index0]; int i, j, okay; - + i = 0; /* contrain raw label to [A-Za-z0-9_] */ while ((i < RAW_LABEL_LENGTH) && rawLabel[i]) { @@ -243,7 +243,7 @@ int rrdInit(void) { int ret = 0; struct stat tmp; - + sensorLog(LOG_DEBUG, "sensor RRD init"); if (stat(rrdFile, &tmp)) { if (errno == ENOENT) { @@ -252,7 +252,7 @@ int rrdInit(void) const char *argv[6 + MAX_RRD_SENSORS] = { "sensord", rrdFile, "-s", stepBuff }; - + sensorLog(LOG_INFO, "creating round robin database"); num = rrdGetSensors(argv + argc); if (num == 0) { @@ -286,7 +286,7 @@ int rrdInit(void) } } sensorLog(LOG_DEBUG, "sensor RRD inited"); - + return ret; } @@ -450,7 +450,7 @@ int rrdUpdate(void) } } sensorLog(LOG_DEBUG, "sensor rrd updated"); - + return ret; } @@ -480,6 +480,6 @@ int rrdCGI(void) } printf("
\nsensord by Merlin Hughes, all credit to the lm_sensors crew.\n
\n"); printf("