sensord: Refactoring of parseChips()
PATCH 5/8 sensord: Refactoring of parseChips()
Did some refactoring in parseChips(). This fixes some deep indentation levels.
---
args.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
prog/sensord/args.c +19 -18
@@ -279,6 +279,8 @@int parseChips (int argc,char **argv) { +int i, n = argc - optind, err; +if (optind = argc) { sensord_args.chipNames[0].prefix SENSORS_CHIP_NAME_PREFIX_ANY;
@@ -286,26 +288,25 @@ sensord_args.chipNames[0 ].bus.nr =SENSORS_BUS_NR_ANY ; sensord_args.chipNames[0 ].addr =SENSORS_CHIP_NAME_ADDR_ANY ; sensord_args.numChipNames =1 ; - }else { -int i, n = argc - optind, err; -if (n >MAX_CHIP_NAMES ) { -fprintf (stderr,"Too many chip names.\n" ); -return -1 ; - } -for (i =0 ; i < n; ++ i) { -char *arg = argv[optind + i]; - err =sensors_parse_chip_name (arg, - sensord_args.chipNames + - i); -if (err) { -fprintf (stderr, -"Invalid chip name `%s': %s\n" , arg, -sensors_strerror (err)); -return -1 ; - } +return 0 ; + } + +if (n >MAX_CHIP_NAMES ) { +fprintf (stderr,"Too many chip names.\n" ); +return -1 ; + } +for (i =0 ; i < n; ++ i) { +char *arg = argv[optind + i]; + + err =sensors_parse_chip_name (arg, sensord_args.chipNames + i); +if (err) { +fprintf (stderr,"Invalid chip name `%s': %s\n" , arg, +sensors_strerror (err)); +return -1 ; } - sensord_args.numChipNames = n; } + sensord_args.numChipNames = n; +return 0 ; }
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 10 lines · Andre Prendel
Did some refactoring in
parseChips(). This fixes some deep indentation levels.
---args.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
prog/sensord/args.c line 284
Quoted 6 lines
prog/sensord/args.c +2
-0@@ -279,6 +279,8 @@int parseChips (int argc,char **argv) { +int i, n = argc - optind, err; +if (optind = argc) {
Could be replaced with "if (n = 0)", easier to read.
Quoted 21 lines
prog/sensord/args.c +0
-15sensord_args.chipNames[0 ].prefix >SENSORS_CHIP_NAME_PREFIX_ANY ;@@ -286,26 +288,25 @@ sensord_args.chipNames[0 ].bus.nr =SENSORS_BUS_NR_ANY ; sensord_args.chipNames[0 ].addr =SENSORS_CHIP_NAME_ADDR_ANY ; sensord_args.numChipNames =1 ; - }else { -int i, n = argc - optind, err; -if (n >MAX_CHIP_NAMES ) { -fprintf (stderr,"Too many chip names.\n" ); -return -1 ; - } -for (i =0 ; i < n; ++ i) { -char *arg = argv[optind + i]; - err =sensors_parse_chip_name (arg, - sensord_args.chipNames + - i); -if (err) { -fprintf (stderr, -"Invalid chip name `%s': %s\n" , arg, -sensors_strerror (err));
prog/sensord/args.c line 299
Quoted 10 lines
prog/sensord/args.c +8
-2-return -1 ; - } +return 0 ; + } + +if (n >MAX_CHIP_NAMES ) { +fprintf (stderr,"Too many chip names.\n" ); +return -1 ; + } +for (i =0 ; i < n; ++ i) {
While you're here: no space between ++ and i.
Quoted 14 lines
prog/sensord/args.c +9
-1+char *arg = argv[optind + i]; + + err =sensors_parse_chip_name (arg, sensord_args.chipNames + i); +if (err) { +fprintf (stderr,"Invalid chip name `%s': %s\n" , arg, +sensors_strerror (err)); +return -1 ; } - sensord_args.numChipNames = n; } + sensord_args.numChipNames = n; +return 0 ; }
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 12 lines · Jean Delvare
Quoted 11 lines · Andre Prendel
Did some refactoring in
parseChips(). This fixes some deep indentation levels.
---args.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)prog/sensord/args.c +0
-0@@ -279,6 +279,8 @@
Quoted 7 lines
prog/sensord/args.c line 284
Quoted 5 lines
prog/sensord/args.c +2
-0int parseChips (int argc,char **argv) { +int i, n = argc - optind, err; +if (optind = argc) {Could be replaced with "if (n = 0)", easier to read.
I agree. Will be updated in v2.
Quoted 26 lines
Quoted 26 lines
prog/sensord/args.c +2
-17sensord_args.chipNames[0].prefix > > SENSORS_CHIP_NAME_PREFIX_ANY;@@ -286,26 +288,25 @@ sensord_args.chipNames[0 ].bus.nr =SENSORS_BUS_NR_ANY ; sensord_args.chipNames[0 ].addr =SENSORS_CHIP_NAME_ADDR_ANY ; sensord_args.numChipNames =1 ; - }else { -int i, n = argc - optind, err; -if (n >MAX_CHIP_NAMES ) { -fprintf (stderr,"Too many chip names.\n" ); -return -1 ; - } -for (i =0 ; i < n; ++ i) { -char *arg = argv[optind + i]; - err =sensors_parse_chip_name (arg, - sensord_args.chipNames + - i); -if (err) { -fprintf (stderr, -"Invalid chip name `%s': %s\n" , arg, -sensors_strerror (err)); -return -1 ; - } +return 0 ; + }
Quoted 8 lines
prog/sensord/args.c line 299
Quoted 6 lines
prog/sensord/args.c +6
-0+ +if (n >MAX_CHIP_NAMES ) { +fprintf (stderr,"Too many chip names.\n" ); +return -1 ; + } +for (i =0 ; i < n; ++ i) {While you're here: no space between ++ and i.
Oops, overlooked during the last cleanup :)
Quoted 19 lines
Quoted 15 lines
prog/sensord/args.c +9
-1+char *arg = argv[optind + i]; + + err =sensors_parse_chip_name (arg, sensord_args.chipNames + i); +if (err) { +fprintf (stderr,"Invalid chip name `%s': %s\n" , arg, +sensors_strerror (err)); +return -1 ; } - sensord_args.numChipNames = n; } + sensord_args.numChipNames = n; +return 0 ; }Signature · 1 line
Jean Delvare
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors