From: rpeterso@sourceware.org <rpeterso@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/gfs2 libgfs2/libgfs2.h libgfs2/ondisk. ...
Date: 18 Jun 2007 21:35:58 -0000 [thread overview]
Message-ID: <20070618213558.16129.qmail@sourceware.org> (raw)
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);
next reply other threads:[~2007-06-18 21:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-18 21:35 rpeterso [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-06-18 21:50 [Cluster-devel] cluster/gfs2 libgfs2/libgfs2.h libgfs2/ondisk. rpeterso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070618213558.16129.qmail@sourceware.org \
--to=rpeterso@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.