Merge branch 'master' into value-state

mailru · Aug 24, 2012 · 30328c8 · 30328c8
2 parents ef89e84 + 47da088
commit 30328c8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/c_dump.c b/c_dump.c
@@ -1678,9 +1678,10 @@ cDump(FILE *fh, char* name, ParamDef *def) {
 	fprintf(fh,
 		"int\n"
 		"parse_cfg_file_%s(%s *c, FILE *fh, int check_rdonly, int *n_accepted, int *n_skipped, int *n_optional) {\n"
-		"\tOptDef *option = parseCfgDef(fh);\n"
+		"\tint error;\n"
+		"\tOptDef *option = parseCfgDef(fh, &error);\n"
 		"\tif (option == NULL)\n"
-		"\t\treturn -1;\n"
+		"\t\treturn error ? -1 : 0;\n"
 		"\tacceptCfgDef(c, option, check_rdonly, n_accepted, n_skipped, n_optional);\n"
 		"\tfreeCfgDef(option);\n"
 		"\treturn 0;\n"
@@ -1691,9 +1692,10 @@ cDump(FILE *fh, char* name, ParamDef *def) {
 	fprintf(fh,
 		"int\n"
 		"parse_cfg_buffer_%s(%s *c, char *buffer, int check_rdonly, int *n_accepted, int *n_skipped, int *n_optional) {\n"
-		"\tOptDef *option = parseCfgDefBuffer(buffer);\n"
+		"\tint error;\n"
+		"\tOptDef *option = parseCfgDefBuffer(buffer, &error);\n"
 		"\tif (option == NULL)\n"
-		"\t\treturn -1;\n"
+		"\t\treturn error ? -1 : 0;\n"
 		"\tacceptCfgDef(c, option, check_rdonly, n_accepted, n_skipped, n_optional);\n"
 		"\tfreeCfgDef(option);\n"
 		"\treturn 0;\n"

diff --git a/prscfg.h b/prscfg.h
@@ -31,8 +31,8 @@ typedef struct OptDef {
 	struct OptDef	*next;
 } OptDef;
 
-OptDef* parseCfgDef(FILE *fh);
-OptDef* parseCfgDefBuffer(char *buffer);
+OptDef* parseCfgDef(FILE *fh, int *error);
+OptDef* parseCfgDefBuffer(char *buffer, int *error);
 void 	freeCfgDef(OptDef *def);
 
 typedef	enum ConfettyError {

diff --git a/prscfg.y b/prscfg.y
@@ -414,7 +414,7 @@ freeCfgDef(OptDef *def) {
 }
 
 OptDef*
-parseCfgDef(FILE *fh) {
+parseCfgDef(FILE *fh, int *error) {
 	prscfg_yyscan_t			yyscanner;
 	prscfg_yy_extra_type	yyextra;
 	int						yyresult;
@@ -425,14 +425,16 @@ parseCfgDef(FILE *fh) {
 	yyresult = prscfg_yyparse(yyscanner);
 	prscfgScannerFinish(yyscanner);
 
+	if (error)
+		*error = yyresult;
 	if (yyresult != 0) 
 		return NULL;
 
 	return plainOptDef(output, NULL);
 }
 
 OptDef*
-parseCfgDefBuffer(char *buffer) {
+parseCfgDefBuffer(char *buffer, int *error) {
 	prscfg_yyscan_t			yyscanner;
 	prscfg_yy_extra_type	yyextra;
 	int						yyresult;
@@ -443,6 +445,8 @@ parseCfgDefBuffer(char *buffer) {
 	yyresult = prscfg_yyparse(yyscanner);
 	prscfgScannerFinish(yyscanner);
 
+	if (error)
+		*error = yyresult;
 	if (yyresult != 0) 
 		return NULL;