From 7e0920723c0915673bcb52e1d4f4f3338ad68697 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 16 Oct 2010 01:06:13 +0000
Subject: * ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command  
 line options.

* ext/sdbm/_sdbm.c (makroom): suppress unused result warning.

* ext/sdbm/extconf.rb: disable BADMESS, a library should not emit
  messages directly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 10 ++++++++++
 ext/sdbm/_sdbm.c    | 19 ++++++++++++-------
 ext/sdbm/extconf.rb |  1 +
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6b644f79a..d04a361e9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Oct 16 10:06:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command
+	  line options.
+
+	* ext/sdbm/_sdbm.c (makroom): suppress unused result warning.
+
+	* ext/sdbm/extconf.rb: disable BADMESS, a library should not emit
+	  messages directly.
+
 Sat Oct 16 08:39:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dln.c (dln_strerror): get English message first, instead of
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 0df95ece8f..efab2dcb79 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -39,9 +39,14 @@
  * important tuning parms (hah)
  */
 
-#define SEEDUPS		/* always detect duplicates */
-#define BADMESS		/* generate a message for worst case:
+#ifndef SEEDUPS
+#define SEEDUPS 1	/* always detect duplicates */
+#endif
+#ifndef BADMESS
+#define BADMESS 1	/* generate a message for worst case:
 			   cannot make room after SPLTMAX splits */
+#endif
+
 /*
  * misc
  */
@@ -67,7 +72,7 @@ static int   delpair proto((char *, datum));
 static int   chkpage proto((char *));
 static datum getnkey proto((char *, int));
 static void  splpage proto((char *, char *, long));
-#ifdef SEEDUPS
+#if SEEDUPS
 static int   duppair proto((char *, datum));
 #endif
 
@@ -302,7 +307,7 @@ sdbm_store(register DBM *db, datum key, datum val, int flags)
  */
 		if (flags == DBM_REPLACE)
 			(void) delpair(db->pagbuf, key);
-#ifdef SEEDUPS
+#if SEEDUPS
 		else if (duppair(db->pagbuf, key))
 			return 1;
 #endif
@@ -421,8 +426,8 @@ makroom(register DBM *db, long int hash, int need)
  * if we are here, this is real bad news. After SPLTMAX splits,
  * we still cannot fit the key. say goodnight.
  */
-#ifdef BADMESS
-	(void) write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44);
+#if BADMESS
+	(void) (write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44) < 0);
 #endif
 	return 0;
 
@@ -698,7 +703,7 @@ getpair(char *pag, datum key)
 	return val;
 }
 
-#ifdef SEEDUPS
+#if SEEDUPS
 static int
 duppair(char *pag, datum key)
 {
diff --git a/ext/sdbm/extconf.rb b/ext/sdbm/extconf.rb
index cc6c8cefd1..67796fbf8a 100644
--- a/ext/sdbm/extconf.rb
+++ b/ext/sdbm/extconf.rb
@@ -1,3 +1,4 @@
 require 'mkmf'
 
+$defs << "-D""BADMESS=0"
 create_makefile("sdbm")
-- 
cgit v1.2.3