dlm: master - dlm_tool: fix lockdebug parsing of first_lkid

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=140561b3523713b1faff87dc76f2e21d88adc2b4
Commit:        140561b3523713b1faff87dc76f2e21d88adc2b4
Parent:        e439913942becf6820cb653246513131c34f6155
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Wed Mar 11 16:05:08 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Wed Mar 11 16:06:43 2009 -0500

dlm_tool: fix lockdebug parsing of first_lkid

It's unusual for first_lkid to be non-zero, wasn't being parsed properly.

Signed-off-by: David Teigland <teigland@redhat.com>
---
 dlm/tool/main.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index d055b69..d091051 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -388,7 +388,7 @@ void do_leave(char *name)
 	printf("done\n");
 }
 
-char *pr_master(int nodeid, uint32_t first_lkid)
+char *pr_master(int nodeid, char *first_lkid)
 {
 	static char buf[64];
 
@@ -399,7 +399,7 @@ char *pr_master(int nodeid, uint32_t first_lkid)
 	else if (!nodeid)
 		sprintf(buf, "Master");
 	else if (nodeid == -1)
-		sprintf(buf, "Lookup lkid %08x", first_lkid);
+		sprintf(buf, "Lookup lkid %s", first_lkid);
 
 	return buf;
 }
@@ -422,14 +422,15 @@ void print_rsb(char *line, struct rinfo *ri)
 {
 	char type[4], namefmt[4], *p;
 	char addr[64];
+	char first_lkid[64];
 	int rv, nodeid, root_list, recover_list, recover_locks_count, namelen;
-	uint32_t first_lkid, flags;
+	uint32_t flags;
 
-	rv = sscanf(line, "%s %s %d %u %u %d %d %u %u %s",
+	rv = sscanf(line, "%s %s %d %s %u %d %d %u %u %s",
 		    type,
 		    addr,
 		    &nodeid,
-		    &first_lkid,
+		    first_lkid,
 		    &flags,
 		    &root_list,
 		    &recover_list,