You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2016/03/22 14:50:43 UTC
qpid-dispatch git commit: NO-JIRA: Fixed compile and link errors
Repository: qpid-dispatch
Updated Branches:
refs/heads/master d5a9fe826 -> 2b1d8f67f
NO-JIRA: Fixed compile and link errors
Several "variable not initiatialized" warnings.
The offer one was definitely a bug but I'm not 100% sure of my fix..
Added missing extern declarations on const char* constants.
Several tests are failing after this fix, not sure if the fix is the
problem or they were already failing.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/2b1d8f67
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/2b1d8f67
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/2b1d8f67
Branch: refs/heads/master
Commit: 2b1d8f67f3ad5dd25edaf8fc71117988a14e102d
Parents: d5a9fe8
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Mar 21 10:00:38 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Mar 22 09:42:49 2016 -0400
----------------------------------------------------------------------
include/qpid/dispatch/amqp.h | 20 ++++++++++----------
src/router_core/transfer.c | 4 ++--
src/router_node.c | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2b1d8f67/include/qpid/dispatch/amqp.h
----------------------------------------------------------------------
diff --git a/include/qpid/dispatch/amqp.h b/include/qpid/dispatch/amqp.h
index 2793c6d..d4bc340 100644
--- a/include/qpid/dispatch/amqp.h
+++ b/include/qpid/dispatch/amqp.h
@@ -91,32 +91,32 @@ enum {
/** @name Message Annotation Headers */
/// @{
-const char * const QD_MA_INGRESS; ///< Ingress Router
-const char * const QD_MA_TRACE; ///< Trace
-const char * const QD_MA_TO; ///< To-Override
-const char * const QD_MA_CLASS; ///< Message-Class
+extern const char * const QD_MA_INGRESS; ///< Ingress Router
+extern const char * const QD_MA_TRACE; ///< Trace
+extern const char * const QD_MA_TO; ///< To-Override
+extern const char * const QD_MA_CLASS; ///< Message-Class
/// @}
/** @name Container Capabilities */
/// @{
-const char * const QD_CAPABILITY_ANONYMOUS_RELAY;
+extern const char * const QD_CAPABILITY_ANONYMOUS_RELAY;
/// @}
/** @name Link Terminus Capabilities */
/// @{
-const char * const QD_CAPABILITY_ROUTER_CONTROL;
-const char * const QD_CAPABILITY_ROUTER_DATA;
+extern const char * const QD_CAPABILITY_ROUTER_CONTROL;
+extern const char * const QD_CAPABILITY_ROUTER_DATA;
/// @}
/** @name Dynamic Node Properties */
/// @{
-const char * const QD_DYNAMIC_NODE_PROPERTY_ADDRESS; ///< Address for routing dynamic sources
+extern const char * const QD_DYNAMIC_NODE_PROPERTY_ADDRESS; ///< Address for routing dynamic sources
/// @}
/** @name Miscellaneous Strings */
/// @{
-const char * const QD_INTERNODE_LINK_NAME_1;
-const char * const QD_INTERNODE_LINK_NAME_2;
+extern const char * const QD_INTERNODE_LINK_NAME_1;
+extern const char * const QD_INTERNODE_LINK_NAME_2;
/// @}
/** @name AMQP error codes. */
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2b1d8f67/src/router_core/transfer.c
----------------------------------------------------------------------
diff --git a/src/router_core/transfer.c b/src/router_core/transfer.c
index 47b499b..e348b3e 100644
--- a/src/router_core/transfer.c
+++ b/src/router_core/transfer.c
@@ -98,7 +98,7 @@ void qdr_link_process_deliveries(qdr_core_t *core, qdr_link_t *link, int credit)
qdr_connection_t *conn = link->conn;
qdr_delivery_t *dlv;
bool drained = false;
- int offer;
+ int offer = -1;
while (credit > 0 && !drained) {
sys_mutex_lock(conn->work_lock);
@@ -124,7 +124,7 @@ void qdr_link_process_deliveries(qdr_core_t *core, qdr_link_t *link, int credit)
if (drained)
core->drained_handler(core->user_context, link);
- else
+ else if (offer != -1)
core->offer_handler(core->user_context, link, offer);
//
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2b1d8f67/src/router_node.c
----------------------------------------------------------------------
diff --git a/src/router_node.c b/src/router_node.c
index bf093df..99460c6 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -460,10 +460,10 @@ static int router_link_detach_handler(void* context, qd_link_t *link, qd_detach_
static void router_opened_handler(qd_router_t *router, qd_connection_t *conn, bool inbound)
{
- qdr_connection_role_t role;
- bool strip_annotations_in;
- bool strip_annotations_out;
- const char *name;
+ qdr_connection_role_t role = 0;
+ bool strip_annotations_in = false;
+ bool strip_annotations_out = false;
+ const char *name = 0;
pn_connection_t *pn_conn = qd_connection_pn(conn);
qd_router_connection_get_config(conn, &role, &name,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org