From faa9a862eff93d51e5339fac8d410ed1c26cc5ae Mon Sep 17 00:00:00 2001 From: hsbt Date: Sun, 13 Jul 2014 08:32:32 +0000 Subject: * ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro. * ext/sdbm/init.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/gdbm/gdbm.c | 6 +++--- ext/sdbm/init.c | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7be9d9aee..c4275570c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 13 17:31:51 2014 SHIBATA Hiroshi + + * ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro. + * ext/sdbm/init.c: ditto. + Sun Jul 13 17:25:50 2014 SHIBATA Hiroshi * ext/dbm/dbm.c: fix wrong arguments in GetDBM2 macro by @v2e4lisp. diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index ff2638e389..c3f228b9d8 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -106,9 +106,9 @@ closed_dbm(void) if ((dbmp)->di_dbm == 0) closed_dbm();\ } while (0) -#define GetDBM2(obj, data, dbm) do {\ - GetDBM((obj), (data));\ - (dbm) = dbmp->di_dbm;\ +#define GetDBM2(obj, dbmp, dbm) do {\ + GetDBM((obj), (dbmp));\ + (dbm) = (dbmp)->di_dbm; \ } while (0) static void diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index 596d954159..f0e7aa5d6c 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -83,9 +83,9 @@ closed_sdbm() if ((dbmp)->di_dbm == 0) closed_sdbm();\ } while (0) -#define GetDBM2(obj, data, dbm) do {\ - GetDBM((obj), (data));\ - (dbm) = dbmp->di_dbm;\ +#define GetDBM2(obj, dbmp, dbm) do {\ + GetDBM((obj), (dbmp));\ + (dbm) = (dbmp)->di_dbm; \ } while (0) static void -- cgit v1.2.3