[Cluster-devel] cluster/gfs2 libgfs2/libgfs2.h libgfs2/ondisk. ...
rpeterso at sourceware.org
rpeterso at sourceware.org
Mon Jun 18 21:35:58 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rpeterso at sourceware.org 2007-06-18 21:35:58
Modified files:
gfs2/libgfs2 : libgfs2.h ondisk.c
gfs2/tool : sb.c
Log message:
Resolves: bz 244163: Incorrect output of gfs2_tool sb <dev> all
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/libgfs2.h.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/ondisk.c.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/sb.c.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- cluster/gfs2/libgfs2/libgfs2.h 2007/05/15 18:11:10 1.13
+++ cluster/gfs2/libgfs2/libgfs2.h 2007/06/18 21:35:58 1.14
@@ -546,7 +546,7 @@
extern void print_it(const char *label, const char *fmt,
const char *fmt2, ...);
#define pv(struct, member, fmt, fmt2) do { \
- print_it(" "#member":", fmt, fmt2, struct->member); \
+ print_it(" "#member, fmt, fmt2, struct->member); \
} while (FALSE);
#define pv2(struct, member, fmt, fmt2) do { \
print_it(" ", fmt, fmt2, struct->member); \
--- cluster/gfs2/libgfs2/ondisk.c 2006/06/14 13:55:11 1.5
+++ cluster/gfs2/libgfs2/ondisk.c 2007/06/18 21:35:58 1.6
@@ -167,8 +167,8 @@
gfs2_inum_print(&sb->sb_master_dir);
gfs2_inum_print(&sb->sb_root_dir);
- pv(sb, sb_lockproto, "%s", "0x%x");
- pv(sb, sb_locktable, "%s", "0x%x");
+ pv(sb, sb_lockproto, "%s", NULL);
+ pv(sb, sb_locktable, "%s", NULL);
}
void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf)
--- cluster/gfs2/tool/sb.c 2006/05/05 18:06:09 1.2
+++ cluster/gfs2/tool/sb.c 2007/06/18 21:35:58 1.3
@@ -36,11 +36,12 @@
extern int gfs2_sb_out(struct gfs2_sb *sb, char *buf);
-void print_it(const char *label, const char *fmt, ...)
+void print_it(const char *label, const char *fmt, const char *fmt2, ...)
{
va_list args;
- va_start(args, fmt);
- printf("%s", label);
+
+ va_start(args, fmt2);
+ printf("%s = ", label);
vprintf(fmt, args);
printf("\n");
va_end(args);
More information about the Cluster-devel
mailing list