diff options
| -rw-r--r-- | include/libcgroup.h | 1 | ||||
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/parse.y | 26 |
3 files changed, 15 insertions, 14 deletions
diff --git a/include/libcgroup.h b/include/libcgroup.h index 52f79f8..b58b2bb 100644 --- a/include/libcgroup.h +++ b/include/libcgroup.h @@ -88,6 +88,7 @@ enum cgroup_errors { ECGMOUNTFAIL, ECGSENTINEL, /* Please insert further error codes above this */ ECGEOF, /* End of file, iterator */ + ECGCONFIGPARSEFAIL,/* Failed to parse config file (cgconfig.conf). */ }; #define ECGRULESPARSEFAIL ECGROUPPARSEFAIL diff --git a/src/config.c b/src/config.c index da2c268..130fac1 100644 --- a/src/config.c +++ b/src/config.c @@ -467,7 +467,7 @@ int cgroup_config_load_config(const char *pathname) if (yyparse() != 0) { cgroup_dbg("Failed to parse file %s\n", pathname); fclose(yyin); - return ECGROUPPARSEFAIL; + return ECGCONFIGPARSEFAIL; } error = cgroup_config_mount_fs(); diff --git a/src/parse.y b/src/parse.y index 8c7ae24..d1f8678 100644 --- a/src/parse.y +++ b/src/parse.y @@ -72,7 +72,7 @@ group : GROUP ID '{' group_conf '}' else { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -85,7 +85,7 @@ group_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -95,7 +95,7 @@ group_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -105,7 +105,7 @@ group_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -146,7 +146,7 @@ task_namevalue_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -156,7 +156,7 @@ task_namevalue_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -169,7 +169,7 @@ admin_namevalue_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -179,7 +179,7 @@ admin_namevalue_conf if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -192,7 +192,7 @@ task_or_admin if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -202,7 +202,7 @@ task_or_admin if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -214,7 +214,7 @@ admin_conf: ADMIN '{' admin_namevalue_conf '}' if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -226,7 +226,7 @@ task_conf: TASK '{' task_namevalue_conf '}' if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } @@ -259,7 +259,7 @@ mount : MOUNT '{' mountvalue_conf '}' if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); - $$ = 0; + $$ = ECGCONFIGPARSEFAIL; return $$; } } |