NO-JIRA: Move internal is_log_component_enabled() to connection_manager_private.h
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c48e55c0 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c48e55c0 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c48e55c0 Branch: refs/heads/master Commit: c48e55c0a2be33373e846d3ff36b3bb3da281c33 Parents: cdc71d4 Author: Alan Conway <acon...@redhat.com> Authored: Thu Jun 28 12:21:17 2018 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Thu Jun 28 23:12:27 2018 -0400 ---------------------------------------------------------------------- include/qpid/dispatch/server.h | 12 ++---------- src/connection_manager.c | 2 +- src/connection_manager_private.h | 1 + src/message.c | 19 ++++++++++--------- 4 files changed, 14 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c48e55c0/include/qpid/dispatch/server.h ---------------------------------------------------------------------- diff --git a/include/qpid/dispatch/server.h b/include/qpid/dispatch/server.h index 9fe9c2c..a037a14 100644 --- a/include/qpid/dispatch/server.h +++ b/include/qpid/dispatch/server.h @@ -566,20 +566,12 @@ const char* qd_connection_name(const qd_connection_t *c); */ const char* qd_connection_remote_ip(const qd_connection_t *c); -/** - * @} - */ - -bool is_log_component_enabled(qd_log_bits log_message, char *component_name); - -/** - * @}. - */ bool qd_connection_strip_annotations_in(const qd_connection_t *c); +void qd_connection_wake(qd_connection_t *ctx); + /** * @} */ -void qd_connection_wake(qd_connection_t *ctx); #endif http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c48e55c0/src/connection_manager.c ---------------------------------------------------------------------- diff --git a/src/connection_manager.c b/src/connection_manager.c index 066146e..f9bcdee 100644 --- a/src/connection_manager.c +++ b/src/connection_manager.c @@ -451,7 +451,7 @@ static qd_error_t load_server_config(qd_dispatch_t *qd, qd_server_config_t *conf } -bool is_log_component_enabled(qd_log_bits log_message, char *component_name) { +bool is_log_component_enabled(qd_log_bits log_message, const char *component_name) { for(int i=0;;i++) { const char *component = qd_log_message_components[i]; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c48e55c0/src/connection_manager_private.h ---------------------------------------------------------------------- diff --git a/src/connection_manager_private.h b/src/connection_manager_private.h index e56ef89..cf5fc06 100644 --- a/src/connection_manager_private.h +++ b/src/connection_manager_private.h @@ -29,5 +29,6 @@ void qd_connection_manager_connection_opened(qd_connection_t *conn); void qd_connection_manager_connection_closed(qd_connection_t *conn); +bool is_log_component_enabled(qd_log_bits log_message, const char *component_name); #endif http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c48e55c0/src/message.c ---------------------------------------------------------------------- diff --git a/src/message.c b/src/message.c index dfa0a37..0553719 100644 --- a/src/message.c +++ b/src/message.c @@ -27,6 +27,7 @@ #include <proton/object.h> #include "message_private.h" #include "compose_private.h" +#include "connection_manager_private.h" #include "aprintf.h" #include <string.h> #include <ctype.h> @@ -237,7 +238,7 @@ static void print_parsed_field(qd_parsed_field_t *parsed_field, char **begin, ch } quote(str_val, len, begin, end); } - break; + break; } case QD_AMQP_MAP8: case QD_AMQP_MAP32: { @@ -292,16 +293,16 @@ static void print_parsed_field(qd_parsed_field_t *parsed_field, char **begin, ch static void print_field(qd_message_t *msg, int field, int max, char *pre, char *post, char **begin, char *end) { - qd_iterator_t* iter = 0; + qd_iterator_t* iter = 0; // TODO - Need to discuss this. I have a question. - if (field == QD_FIELD_APPLICATION_PROPERTIES) { - iter = qd_message_field_iterator(msg, field); + if (field == QD_FIELD_APPLICATION_PROPERTIES) { + iter = qd_message_field_iterator(msg, field); } else { - iter = qd_message_field_iterator_typed(msg, field); - } + iter = qd_message_field_iterator_typed(msg, field); + } aprintf(begin, end, "%s", pre); @@ -310,7 +311,7 @@ static void print_field(qd_message_t *msg, int field, int max, char *pre, char return; } - qd_parsed_field_t *parsed_field = qd_parse(iter); + qd_parsed_field_t *parsed_field = qd_parse(iter); // If there is a problem with parsing a field, just return if (!qd_parse_ok(parsed_field)) { @@ -318,13 +319,13 @@ static void print_field(qd_message_t *msg, int field, int max, char *pre, char qd_iterator_free(iter); qd_parse_free(parsed_field); return; - } + } print_parsed_field(parsed_field, begin, end, max); aprintf(begin, end, "%s", post); qd_iterator_free(iter); - qd_parse_free(parsed_field); + qd_parse_free(parsed_field); } static const char REPR_END[] = "}\0"; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
