Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=076... Commit: 07619f61398738c60d6f9265f99987ba2573f581 Parent: 2459ceb0301b492d1d3e53a4d008e27c9328f093 Author: Lon Hohberger lhh@redhat.com AuthorDate: Wed Aug 25 13:50:55 2010 -0400 Committer: Lon Hohberger lhh@redhat.com CommitterDate: Fri Sep 24 18:17:21 2010 -0400
rgmanager: Use rg_strings.c for flags
Signed-off-by: Lon Hohberger lhh@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)); } }
cluster-commits@lists.fedorahosted.org