kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/dbm/dbm.c (fdbm_initialize): disable Berkeley DB error messages.

Browse source 
* ext/dbm/extconf.rb: check DBC type for above.

[ruby-dev:45269]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-02-21 21:04:04 +00:00
parent ca9b0f56fc
commit eac1d9cfca
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Feb 22 06:02:42 2012 Tanaka Akira <akr@fsij.org>
* ext/dbm/dbm.c (fdbm_initialize): disable Berkeley DB error messages.
* ext/dbm/extconf.rb: check DBC type for above.
[ruby-dev:45269]
Tue Feb 21 20:23:47 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Feb 21 20:23:47 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_any_hash): treat Qundef like as other special constants. * hash.c (rb_any_hash): treat Qundef like as other special constants.

6
ext/dbm/dbm.c
View file

@ -196,6 +196,12 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
#if defined(HAVE_DBM_DIRFNO) #if defined(HAVE_DBM_DIRFNO)
rb_fd_fix_cloexec(dbm_dirfno(dbm)); rb_fd_fix_cloexec(dbm_dirfno(dbm));
#endif #endif
#if defined(_DB_H_) && defined(HAVE_TYPE_DBC)
/* Disable Berkeley DB error messages such as:
* DB->put: attempt to modify a read-only database */
((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL);
#endif
} }
if (!dbm) { if (!dbm) {

5
ext/dbm/extconf.rb
View file

@ -222,6 +222,11 @@ def headers.db_check2(db, hdr)
return false return false
end end
# DBC type is required to disable error messages by Berkeley DB 2 or later.
if have_db_header
have_type("DBC", hdr, hsearch)
end
if hsearch if hsearch
$defs << hsearch $defs << hsearch
@defs = hsearch @defs = hsearch