This patch rearranges the guts of the main parsing loop to keep it
more within the 80th column. The logic has not been changed.
Signed-off-by: Richard Cochran <richardcoch...@gmail.com>
---
config.c | 75 +++++++++++++++++++++++++++++-----------------------------------
1 file changed, 34 insertions(+), 41 deletions(-)
diff --git a/config.c b/config.c
index 20f6273..42afbbe 100644
--- a/config.c
+++ b/config.c
@@ -555,53 +555,46 @@ int config_read(char *name, struct config *cfg)
continue;
}
- switch (current_section) {
- case GLOBAL_SECTION:
- case PORT_SECTION:
- if (parse_setting_line(line, &option, &value)) {
- fprintf(stderr, "could not parse line %d in %s
section\n",
- line_num,
- current_section ==
GLOBAL_SECTION ?
- "global" :
current_port->name);
- goto parse_error;
- }
+ if (current_section == UNKNOWN_SECTION) {
+ fprintf(stderr, "line %d is not in a section\n",
line_num);
+ goto parse_error;
+ }
- check_deprecated_options(&option);
+ if (parse_setting_line(line, &option, &value)) {
+ fprintf(stderr, "could not parse line %d in %s
section\n",
+ line_num, current_section == GLOBAL_SECTION ?
+ "global" : current_port->name);
+ goto parse_error;
+ }
- if (current_section == GLOBAL_SECTION)
- parser_res = parse_global_setting(option,
value, cfg);
- else
- parser_res = parse_port_setting(cfg, option,
value, current_port);
+ check_deprecated_options(&option);
- switch (parser_res) {
- case PARSED_OK:
- break;
- case NOT_PARSED:
- fprintf(stderr, "unknown option %s at line %d
in %s section\n",
- option, line_num,
- current_section ==
GLOBAL_SECTION ?
- "global" :
current_port->name);
- goto parse_error;
- case BAD_VALUE:
- fprintf(stderr, "%s is a bad value for option
%s at line %d\n",
- value, option, line_num);
- goto parse_error;
- case MALFORMED:
- fprintf(stderr, "%s is a malformed value for
option %s at line %d\n",
- value, option, line_num);
- goto parse_error;
- case OUT_OF_RANGE:
- fprintf(stderr, "%s is an out of range value
for option %s at line %d\n",
- value, option, line_num);
- goto parse_error;
- }
+ if (current_section == GLOBAL_SECTION)
+ parser_res = parse_global_setting(option, value, cfg);
+ else
+ parser_res = parse_port_setting(cfg, option, value,
current_port);
+ switch (parser_res) {
+ case PARSED_OK:
break;
- case UNKNOWN_SECTION:
- fprintf(stderr, "line %d is not in a section\n",
line_num);
+ case NOT_PARSED:
+ fprintf(stderr, "unknown option %s at line %d in %s
section\n",
+ option, line_num,
+ current_section == GLOBAL_SECTION ? "global" :
+ current_port->name);
+ goto parse_error;
+ case BAD_VALUE:
+ fprintf(stderr, "%s is a bad value for option %s at
line %d\n",
+ value, option, line_num);
+ goto parse_error;
+ case MALFORMED:
+ fprintf(stderr, "%s is a malformed value for option %s
at line %d\n",
+ value, option, line_num);
+ goto parse_error;
+ case OUT_OF_RANGE:
+ fprintf(stderr, "%s is an out of range value for option
%s at line %d\n",
+ value, option, line_num);
goto parse_error;
- default:
- continue;
}
}
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
