Repository: qpid-dispatch Updated Branches: refs/heads/master 4f65d46d3 -> 9e4ec7d49
DISPATCH-264 - Remove "%ld" formats for 64-bit quantities. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9e4ec7d4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9e4ec7d4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9e4ec7d4 Branch: refs/heads/master Commit: 9e4ec7d4943b3a0c0f07dc35b005f9ca73ce924d Parents: 4f65d46 Author: Ted Ross <[email protected]> Authored: Wed Apr 6 16:11:20 2016 -0400 Committer: Ted Ross <[email protected]> Committed: Wed Apr 6 16:11:20 2016 -0400 ---------------------------------------------------------------------- src/router_core/agent_config_address.c | 5 +++-- src/router_core/agent_config_auto_link.c | 7 ++++--- src/router_core/agent_config_link_route.c | 5 +++-- src/router_core/agent_link.c | 7 ++++--- src/router_core/route_control.c | 3 ++- 5 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9e4ec7d4/src/router_core/agent_config_address.c ---------------------------------------------------------------------- diff --git a/src/router_core/agent_config_address.c b/src/router_core/agent_config_address.c index ace2b58..3d46f40 100644 --- a/src/router_core/agent_config_address.c +++ b/src/router_core/agent_config_address.c @@ -19,6 +19,7 @@ #include <qpid/dispatch/ctools.h> #include "agent_config_address.h" +#include <inttypes.h> #include <stdio.h> #define QDR_CONFIG_ADDRESS_NAME 0 @@ -60,7 +61,7 @@ static void qdr_config_address_insert_column_CT(qdr_address_config_t *addr, int case QDR_CONFIG_ADDRESS_IDENTITY: { char id_str[100]; - snprintf(id_str, 100, "%ld", addr->identity); + snprintf(id_str, 100, "%"PRId64, addr->identity); qd_compose_insert_string(body, id_str); break; } @@ -224,7 +225,7 @@ static qdr_address_config_t *qdr_address_config_find_by_identity_CT(qdr_core_t * while (rc) { // Convert the passed in identity to a char* char id[100]; - snprintf(id, 100, "%ld", rc->identity); + snprintf(id, 100, "%"PRId64, rc->identity); if (qd_field_iterator_equal(identity, (const unsigned char*) id)) break; rc = DEQ_NEXT(rc); http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9e4ec7d4/src/router_core/agent_config_auto_link.c ---------------------------------------------------------------------- diff --git a/src/router_core/agent_config_auto_link.c b/src/router_core/agent_config_auto_link.c index 74ae056..b4cacc3 100644 --- a/src/router_core/agent_config_auto_link.c +++ b/src/router_core/agent_config_auto_link.c @@ -20,6 +20,7 @@ #include <qpid/dispatch/ctools.h> #include "agent_config_auto_link.h" #include "route_control.h" +#include <inttypes.h> #include <stdio.h> #define QDR_CONFIG_AUTO_LINK_NAME 0 @@ -67,7 +68,7 @@ static void qdr_config_auto_link_insert_column_CT(qdr_auto_link_t *al, int col, break; case QDR_CONFIG_AUTO_LINK_IDENTITY: - snprintf(id_str, 100, "%ld", al->identity); + snprintf(id_str, 100, "%"PRId64, al->identity); qd_compose_insert_string(body, id_str); break; @@ -110,7 +111,7 @@ static void qdr_config_auto_link_insert_column_CT(qdr_auto_link_t *al, int col, case QDR_CONFIG_AUTO_LINK_LINK_REF: if (al->link) { - snprintf(id_str, 100, "%ld", al->link->identity); + snprintf(id_str, 100, "%"PRId64, al->link->identity); qd_compose_insert_string(body, id_str); } else qd_compose_insert_null(body); @@ -262,7 +263,7 @@ static qdr_auto_link_t *qdr_auto_link_config_find_by_identity_CT(qdr_core_t *cor while (rc) { // Convert the passed in identity to a char* char id[100]; - snprintf(id, 100, "%ld", rc->identity); + snprintf(id, 100, "%"PRId64, rc->identity); if (qd_field_iterator_equal(identity, (const unsigned char*) id)) break; rc = DEQ_NEXT(rc); http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9e4ec7d4/src/router_core/agent_config_link_route.c ---------------------------------------------------------------------- diff --git a/src/router_core/agent_config_link_route.c b/src/router_core/agent_config_link_route.c index dc3075e..25ab442 100644 --- a/src/router_core/agent_config_link_route.c +++ b/src/router_core/agent_config_link_route.c @@ -20,6 +20,7 @@ #include <qpid/dispatch/ctools.h> #include "agent_config_link_route.h" #include "route_control.h" +#include <inttypes.h> #include <stdio.h> #define QDR_CONFIG_LINK_ROUTE_NAME 0 @@ -61,7 +62,7 @@ static void qdr_config_link_route_insert_column_CT(qdr_link_route_t *lr, int col case QDR_CONFIG_LINK_ROUTE_IDENTITY: { char id_str[100]; - snprintf(id_str, 100, "%ld", lr->identity); + snprintf(id_str, 100, "%"PRId64, lr->identity); qd_compose_insert_string(body, id_str); break; } @@ -252,7 +253,7 @@ static qdr_link_route_t *qdr_link_route_config_find_by_identity_CT(qdr_core_t *c while (rc) { // Convert the passed in identity to a char* char id[100]; - snprintf(id, 100, "%ld", rc->identity); + snprintf(id, 100, "%"PRId64, rc->identity); if (qd_field_iterator_equal(identity, (const unsigned char*) id)) break; rc = DEQ_NEXT(rc); http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9e4ec7d4/src/router_core/agent_link.c ---------------------------------------------------------------------- diff --git a/src/router_core/agent_link.c b/src/router_core/agent_link.c index 29419cf..6830367 100644 --- a/src/router_core/agent_link.c +++ b/src/router_core/agent_link.c @@ -18,6 +18,7 @@ */ #include "agent_link.h" +#include <inttypes.h> #include <stdio.h> #define QDR_LINK_NAME 0 @@ -84,7 +85,7 @@ static void qdr_agent_write_column_CT(qd_composed_field_t *body, int col, qdr_li case QDR_LINK_IDENTITY: { char id[100]; - snprintf(id, 100, "%ld", link->identity); + snprintf(id, 100, "%"PRId64, link->identity); qd_compose_insert_string(body, id); break; } @@ -120,7 +121,7 @@ static void qdr_agent_write_column_CT(qd_composed_field_t *body, int col, qdr_li case QDR_LINK_PEER: if (link->connected_link) { char id[100]; - snprintf(id, 100, "link.%ld", link->connected_link->identity); + snprintf(id, 100, "link.%"PRId64, link->connected_link->identity); qd_compose_insert_string(body, id); } else qd_compose_insert_null(body); @@ -284,7 +285,7 @@ static qdr_link_t *qdr_link_find_by_identity(qdr_core_t *core, qd_field_iterator while(link) { char id[100]; if (link->identity) { - snprintf(id, 100, "%ld", link->identity); + snprintf(id, 100, "%"PRId64, link->identity); if (qd_field_iterator_equal(identity, (const unsigned char *)id)) break; } http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9e4ec7d4/src/router_core/route_control.c ---------------------------------------------------------------------- diff --git a/src/router_core/route_control.c b/src/router_core/route_control.c index 3343153..1e280a2 100644 --- a/src/router_core/route_control.c +++ b/src/router_core/route_control.c @@ -18,6 +18,7 @@ */ #include "route_control.h" +#include <inttypes.h> #include <stdio.h> ALLOC_DEFINE(qdr_link_route_t); @@ -66,7 +67,7 @@ static void qdr_route_log_CT(qdr_core_t *core, const char *text, const char *nam const char *log_name = name ? name : id_string; if (!name) - snprintf(id_string, 64, "%ld", id); + snprintf(id_string, 64, "%"PRId64, id); qd_log(core->log, QD_LOG_INFO, "%s '%s' on %s %s", text, log_name, key[0] == 'L' ? "connection" : "container", &key[1]); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
