Changeset 5679
- Timestamp:
- 03/10/09 11:37:41 (4 years ago)
- Location:
- lm-sensors/trunk/prog/sensord
- Files:
-
- 3 modified
Legend:
- Unmodified
- Added
- Removed
-
lm-sensors/trunk/prog/sensord/args.c
r5678 r5679 258 258 return -1; 259 259 } 260 260 261 261 if (rrdFile && doSet) { 262 262 fprintf(stderr, … … 264 264 return -1; 265 265 } 266 266 267 267 if (doScan && rrdFile) { 268 268 fprintf(stderr, … … 276 276 return -1; 277 277 } 278 278 279 279 if (rrdFile && !rrdTime) { 280 280 fprintf(stderr, … … 282 282 return -1; 283 283 } 284 284 285 285 if (!logTime && !scanTime && !rrdFile) { 286 286 fprintf(stderr, -
lm-sensors/trunk/prog/sensord/chips.c
r5678 r5679 158 158 voltage->format = fmtVolt_2; 159 159 } 160 160 161 161 /* terminate the list */ 162 162 voltage->dataNumbers[pos] = -1; … … 214 214 temperature->format = fmtTemp_only; 215 215 } 216 216 217 217 /* terminate the list */ 218 218 temperature->dataNumbers[pos] = -1; … … 266 266 fan->format = fmtFan_only; 267 267 } 268 268 269 269 /* terminate the list */ 270 270 fan->dataNumbers[pos] = -1; -
lm-sensors/trunk/prog/sensord/rrd.c
r5678 r5679 24 24 /* 25 25 * RRD is the Round Robin Database 26 * 26 * 27 27 * Get this package from: 28 28 * http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ … … 88 88 char *buffer = rrdLabels[index0]; 89 89 int i, j, okay; 90 90 91 91 i = 0; 92 92 /* contrain raw label to [A-Za-z0-9_] */ … … 244 244 int ret = 0; 245 245 struct stat tmp; 246 246 247 247 sensorLog(LOG_DEBUG, "sensor RRD init"); 248 248 if (stat(rrdFile, &tmp)) { … … 253 253 "sensord", rrdFile, "-s", stepBuff 254 254 }; 255 255 256 256 sensorLog(LOG_INFO, "creating round robin database"); 257 257 num = rrdGetSensors(argv + argc); … … 287 287 } 288 288 sensorLog(LOG_DEBUG, "sensor RRD inited"); 289 289 290 290 return ret; 291 291 } … … 451 451 } 452 452 sensorLog(LOG_DEBUG, "sensor rrd updated"); 453 453 454 454 return ret; 455 455 } … … 481 481 printf("<p>\n<small><b>sensord</b> by <a href=\"mailto:merlin@merlin.org\">Merlin Hughes</a>, all credit to the <a href=\"http://www.lm-sensors.org/\">lm_sensors</a> crew.</small>\n</p>\n"); 482 482 printf("</BODY>\n</HTML>\n"); 483 483 484 484 return ret; 485 485 }
