[Cluster-devel] cluster/gfs2/edit gfs2hex.c hexedit.c

[rpeterso at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2006-08-09 20:21:59

Modified files:
	gfs2/edit      : gfs2hex.c hexedit.c 

Log message:
	Hex values were not shown or printed correctly on x86_64.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/gfs2hex.c.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/hexedit.c.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- cluster/gfs2/edit/gfs2hex.c	2006/06/19 20:49:25	1.4
+++ cluster/gfs2/edit/gfs2hex.c	2006/08/09 20:21:59	1.5
@@ -114,6 +114,8 @@
 
 		if (fmt2) {
 			decimalsize = strlen(tmp_string);
+			va_end(args);
+			va_start(args, fmt2);
 			vsprintf(tmp_string, fmt2, args);
 			if (termlines) {
 				move(line, 50);
--- cluster/gfs2/edit/hexedit.c	2006/06/19 20:49:25	1.5
+++ cluster/gfs2/edit/hexedit.c	2006/08/09 20:21:59	1.6
@@ -945,7 +945,7 @@
 		else if (string[0] == '0' && string[1] == 'x')
 			sscanf(string, "%"SCNx64, &temp_blk); /* retrieve in hex */
 		else
-			sscanf(string, "%lld", &temp_blk); /* retrieve decimal */
+			sscanf(string, "%" PRIu64, &temp_blk); /* retrieve decimal */
 
 		if (temp_blk < max_block) {
 			offset = 0;