Cleanup: Define ECGRULESPARSEFAIL for the parser error of cgrules.conf.

Changelog since v2:
o Define ECGRULESPARSEFAIL for avoiding breaking ABI.

Changelog since v1:
o A new patch [Cleanup: Rename ECGROUPPARSEFAIL to ECGRULESPARSEFAIL.]

Now ECGROUPPARSEFAIL is defined for a parser error of /etc/cgrules.conf and
this patch defines ECGRULESPARSEFAIL for the same value for clarifying its
meaning.

Signed-off-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>

diff --git a/include/libcgroup.h b/include/libcgroup.h
index f4245626d90a75f71396b1deff1d8ed5790b85da..52f79f8c845a31f17bbed916ddd4a02fe5ac8b23 100644 (file)
--- a/include/libcgroup.h
+++ b/include/libcgroup.h
@@ -90,6 +90,8 @@ enum cgroup_errors {
        ECGEOF,         /* End of file, iterator */
 };
 
+#define ECGRULESPARSEFAIL      ECGROUPPARSEFAIL
+
 /*
  * Don't use CGROUP_WALK_TYPE_FILE right now. It is added here for
  * later refactoring and better implementation. Most users *should*

diff --git a/src/api.c b/src/api.c
index a0e1b9bab170cd25e1a7df57f43fcb9983cd6ea9..28c0c3d74b98550676c3edaf883cdbe3dcae8369 100644 (file)
--- a/src/api.c
+++ b/src/api.c
@@ -591,7 +591,7 @@ destroyrule:
        cgroup_free_rule(newrule);
 
 parsefail:
-       ret = ECGROUPPARSEFAIL;
+       ret = ECGRULESPARSEFAIL;
 
 close:
        fclose(fp);
@@ -2366,7 +2366,7 @@ int cgroup_reload_cached_rules()
        if (ret) {
                cgroup_dbg("Error parsing configuration file \"%s\": %d.\n",
                        CGRULES_CONF_FILE, ret);
-               ret = ECGROUPPARSEFAIL;
+               ret = ECGRULESPARSEFAIL;
                goto finished;
        }