Page MenuHomeClusterLabs Projects
Files F1842492

No OneTemporary
Actions

View Options

diff --git a/lib/common/output.c b/lib/common/output.c
index 5a29839a04..bd427fda3b 100644
--- a/lib/common/output.c
+++ b/lib/common/output.c
@@ -1,146 +1,150 @@
/*
* Copyright 2019 the Pacemaker project contributors
*
* The version control history for this file may have further details.
*
* This source code is licensed under the GNU Lesser General Public License
* version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
*/
#include <crm/common/util.h>
#include <crm/common/xml.h>
#include <crm/common/internal.h>
#include <crm/common/output.h>
#include <libxml/tree.h>
static GHashTable *formatters = NULL;
void
pcmk__output_free(pcmk__output_t *out) {
out->free_priv(out);
g_hash_table_destroy(out->messages);
free(out->request);
free(out);
}
int
pcmk__output_new(pcmk__output_t **out, const char *fmt_name, const char *filename,
char **argv) {
pcmk__output_factory_t create = NULL;;
if (formatters == NULL) {
return EINVAL;
}
/* If no name was given, just try "text". It's up to each tool to register
* what it supports so this also may not be valid.
*/
if (fmt_name == NULL) {
create = g_hash_table_lookup(formatters, "text");
} else {
create = g_hash_table_lookup(formatters, fmt_name);
}
if (create == NULL) {
return pcmk_err_unknown_format;
}
*out = create(argv);
if (*out == NULL) {
return ENOMEM;
}
if (filename == NULL || safe_str_eq(filename, "-")) {
(*out)->dest = stdout;
} else {
(*out)->dest = fopen(filename, "w");
if ((*out)->dest == NULL) {
return errno;
}
}
(*out)->messages = g_hash_table_new_full(crm_str_hash, g_str_equal, free, NULL);
if ((*out)->init(*out) == false) {
pcmk__output_free(*out);
return ENOMEM;
}
return 0;
}
int
pcmk__register_format(GOptionContext *context, const char *name,
pcmk__output_factory_t create, GOptionEntry *options) {
if (create == NULL) {
return -EINVAL;
}
if (formatters == NULL) {
formatters = g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, NULL);
}
if (options != NULL && context != NULL) {
char *group_name = crm_strdup_printf("output-%s", name);
char *group_desc = crm_strdup_printf("%s Output Options:", name);
char *group_help = crm_strdup_printf("Show %s output help", name);
GOptionGroup *group = g_option_group_new(group_name, group_desc,
group_help, NULL, NULL);
g_option_group_add_entries(group, options);
g_option_context_add_group(context, group);
free(group_name);
free(group_desc);
free(group_help);
}
g_hash_table_insert(formatters, strdup(name), create);
return 0;
}
void
pcmk__register_formats(GOptionContext *context, pcmk__supported_format_t *formats) {
pcmk__supported_format_t *entry = NULL;
+ if (formats == NULL) {
+ return;
+ }
+
for (entry = formats; entry->name != NULL; entry++) {
pcmk__register_format(context, entry->name, entry->create, entry->options);
}
}
int
pcmk__call_message(pcmk__output_t *out, const char *message_id, ...) {
va_list args;
int rc = 0;
pcmk__message_fn_t fn;
fn = g_hash_table_lookup(out->messages, message_id);
if (fn == NULL) {
return -EINVAL;
}
va_start(args, message_id);
rc = fn(out, args);
va_end(args);
return rc;
}
void
pcmk__register_message(pcmk__output_t *out, const char *message_id,
pcmk__message_fn_t fn) {
g_hash_table_replace(out->messages, strdup(message_id), fn);
}
void
pcmk__register_messages(pcmk__output_t *out, pcmk__message_entry_t *table) {
pcmk__message_entry_t *entry;
for (entry = table; entry->message_id != NULL; entry++) {
if (safe_str_eq(out->fmt_name, entry->fmt_name)) {
pcmk__register_message(out, entry->message_id, entry->fn);
}
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 23, 4:50 PM (11 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1018993
Default Alt Text
(4 KB)

Event Timeline