From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Wed, 4 Nov 2009 01:51:33 +0000 (+0900)
Subject: Cleanup: Define ECGRULESPARSEFAIL for the parser error of cgrules.conf.
X-Git-Tag: v0.35~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2378c4f8fb6d32bb73d2f4b9a7281a7b1066fcc9;p=thirdparty%2Flibcgroup.git

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 f4245626..52f79f8c 100644
--- 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 a0e1b9ba..28c0c3d7 100644
--- 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;
 	}