From 49999d06920400a9548c8adc0e22d08a7ca105eb Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 2 Aug 2021 11:24:57 +0200 Subject: [PATCH] cfgtool: Use CS_PRI_NODE_ID for formatting nodeid Signed-off-by: Jan Friesse Reviewed-by: Christine Caulfield --- include/corosync/corotypes.h | 1 + tools/corosync-cfgtool.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/corosync/corotypes.h b/include/corosync/corotypes.h index 12b61eb8..a661cb62 100644 --- a/include/corosync/corotypes.h +++ b/include/corosync/corotypes.h @@ -57,6 +57,7 @@ typedef int64_t cs_time_t; #define CS_MAX(x, y) (((x) > (y)) ? (x) : (y)) #define CS_PRI_NODE_ID "%" PRIu32 +#define CS_PRI_NODE_ID_PADDED "%10" PRIu32 #define CS_PRI_RING_ID_SEQ "%" PRIx64 #define CS_PRI_RING_ID "%" PRIx32 ".%" PRIx64 /** diff --git a/tools/corosync-cfgtool.c b/tools/corosync-cfgtool.c index dc8f99ea..d04d5bea 100644 --- a/tools/corosync-cfgtool.c +++ b/tools/corosync-cfgtool.c @@ -240,7 +240,7 @@ nodestatusget_do (enum user_action action, int brief) if (result == CS_OK) { /* Only display node info if it is reachable (and not us) */ if (node_status.reachable && node_status.nodeid != local_nodeid) { - printf("nodeid: %d", node_status.nodeid); + printf("nodeid: " CS_PRI_NODE_ID "", node_status.nodeid); printf(" reachable"); if (node_status.remote) { printf(" remote"); @@ -311,7 +311,7 @@ nodestatusget_do (enum user_action action, int brief) } else { printf("\tstatus:\n"); for (j=0; j