sensord: Introduce struct sensord_arguments
PATCH 3/8 sensord: Introduce struct sensord_arguments
Introduce struct sensord_arguments.
This structure encapsulate all the variables holding the commandline arguments. So we get rid of plenty of extern variables. This reduces namespace collisions and unifies access.
---
args.c | 100 +++++++++++++++++++++++++++++--------------------------------- args.h | 30 ++++++++++++++++++ rrd.c | 49 +++++++++++++++++------------- sense.c | 6 +-- sensord.c | 57 +++++++++++++++++++---------------- sensord.h | 18 ----------- 6 files changed, 140 insertions(+), 120 deletions(-)
prog/sensord/args.h new file +30 -0
@@ -0,0 +1,30 @@ +#ifndef SENSORD_ARGS_H +#define SENSORD_ARGS_H + +#include <lib/sensors.h> + +#define MAX_CHIP_NAMES 32 + +struct sensord_arguments { +int isDaemon; +const char *cfgFile; +const char *pidFile; +const char *rrdFile; +const char *cgiDir; +int scanTime; +int logTime; +int rrdTime; +int rrdNoAverage; +int syslogFacility; +int doScan; +int doSet; +int doCGI; +int doLoad; +int debug; +sensors_chip_name chipNames[MAX_CHIP_NAMES ]; +int numChipNames; +}; + +extern struct sensord_arguments sensord_args; + +#endif /* SENSORD_ARGS_H */
prog/sensord/args.c +47 -52
199 lines not on this page · raw message
prog/sensord/rrd.c +28 -21
142 lines not on this page · raw message
prog/sensord/sensord.c +31 -26
144 lines not on this page · raw message
prog/sensord/sense.c +3 -3
@@ -26,6 +26,7 @@#include <string.h> #include <syslog.h> +#include "args.h" #include "sensord.h" #include "lib/error.h"
@@ -189,11 +190,10 @@const sensors_chip_name *chip;int i, j, ret =0 ; -for (j =0 ; (ret =0 ) && (j < numChipNames); ++ j) { +for (j =0 ; (ret =0 ) && (j < sensord_args.numChipNames); ++ j) { i =0 ;while ((ret =0 ) && - ((chip =sensors_get_detected_chips (&chipNames[j], &i)) - !=NULL )) { + ((chip =sensors_get_detected_chips (&sensord_args.chipNames[j], &i)) !=NULL )) { ret =doChip (chip, action); } }
prog/sensord/sensord.h +0 -18
@@ -27,24 +27,6 @@/* from args.c */ -extern int isDaemon; -extern const char *sensorsCfgFile; -extern const char *pidFile; -extern const char *rrdFile; -extern const char *cgiDir; -extern int scanTime; -extern int logTime; -extern int rrdTime; -extern int rrdNoAverage; -extern int syslogFacility; -extern int doScan; -extern int doSet; -extern int doCGI; -extern int doLoad; -extern int debug; -extern sensors_chip_name chipNames[]; -extern int numChipNames; -extern int parseArgs (int argc,char **argv);extern int parseChips (int argc,char **argv);
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors