cluster: RHEL6 - rgmanager: Use rg_strings.c for flags
Lon Hohberger
lon at fedoraproject.org
Tue Feb 1 18:10:30 UTC 2011
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0e5e14cd1471464edf14776bd7ac84d14623a03d
Commit: 0e5e14cd1471464edf14776bd7ac84d14623a03d
Parent: 5203d9eefe530a13525dc32d9f48568fbabfd495
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Wed Aug 25 13:50:55 2010 -0400
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Feb 1 12:30:14 2011 -0500
rgmanager: Use rg_strings.c for flags
Resolves: rhbz#634277
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
rgmanager/src/clulib/rg_strings.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rgmanager/src/clulib/rg_strings.c b/rgmanager/src/clulib/rg_strings.c
index 24ee479..fdb1dad 100644
--- a/rgmanager/src/clulib/rg_strings.c
+++ b/rgmanager/src/clulib/rg_strings.c
@@ -81,9 +81,15 @@ const struct string_val rg_state_strings[] = {
const struct string_val rg_flags_strings[] = {
{RG_FLAG_FROZEN, "frozen"},
+ {RG_FLAG_PARTIAL, "partial"},
{0, NULL}
};
+const struct string_val rg_flags_short[] = {
+ {RG_FLAG_FROZEN, "Z"},
+ {RG_FLAG_PARTIAL, "P"},
+ {0, NULL}
+};
const struct string_val agent_ops[] = {
{RS_START, "start"},
@@ -185,14 +191,18 @@ rg_flag_str(int val)
const char *
rg_flags_str(char *flags_string, size_t size, int val, char *separator)
{
+ const struct string_val *table = rg_flags_strings;
int i;
const char *string;
+ if (!separator)
+ table = rg_flags_short;
+
for (i = 0; i < (sizeof(val) * 8); i++) {
if ( val & (1 << i)) {
- if (strlen(flags_string))
+ if (strlen(flags_string) && separator)
strncat(flags_string, separator, size - (strlen(flags_string) + strlen(separator) + 1));
- string = rg_search_table(rg_flags_strings, (1 << i));
+ string = rg_search_table(table, (1 << i));
strncat(flags_string, string, size - (strlen(flags_string) + strlen(string) + 1));
}
}
More information about the cluster-commits
mailing list