[Cluster-devel] [PATCH 1/3] Clean up duplicate ccs query paths.

[Fabio M. Di Nitto]

From: Fabio M. Di Nitto <fabbione at ubuntu.com>

Signed-off-by: Fabio M. Di Nitto <fabbione at ubuntu.com>
---
:100644 100644 33b5dd7... 0de3d0c... M	cman/daemon/cmanccs.c
 cman/daemon/cmanccs.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/cman/daemon/cmanccs.c b/cman/daemon/cmanccs.c
index 33b5dd7..0de3d0c 100644
--- a/cman/daemon/cmanccs.c
+++ b/cman/daemon/cmanccs.c
@@ -45,7 +45,6 @@
 #define PORT_PATH		"/cluster/cman/@port"
 #define KEY_PATH		"/cluster/cman/@keyfile"
 
-#define NODEI_NAME_PATH		"/cluster/clusternodes/clusternode[%d]/@name"
 #define NODE_NAME_PATH_BYNAME	"/cluster/clusternodes/clusternode[@name=\"%s\"]/@name"
 #define NODE_NAME_PATH_BYNUM	"/cluster/clusternodes/clusternode[%d]/@name"
 #define NODE_VOTES_PATH		"/cluster/clusternodes/clusternode[@name=\"%s\"]/@votes"
@@ -500,7 +499,7 @@ static int get_ccs_join_info(void)
 		for (i = 1; ; i++) {
 			name = NULL;
 			memset(path, 0, MAX_PATH_LEN);
-			sprintf(path, NODEI_NAME_PATH, i);
+			sprintf(path, NODE_NAME_PATH_BYNUM, i);
 
 			error = ccs_get(cd, path, &name);
 			if (error || !name)
-- 
1.5.2.5