mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (eval): warning during eval should not cause deadlock.
[ruby-talk:98651] * eval.c (rb_eval): raise TypeError exception for superclass mismatch. [ruby-dev:39567] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7268344d38
commit
0cf6e773be
8 changed files with 62 additions and 27 deletions
|
@ -387,6 +387,14 @@ fgdbm_values_at(argc, argv, obj)
|
|||
return new;
|
||||
}
|
||||
|
||||
static void
|
||||
rb_gdbm_modify(obj)
|
||||
VALUE obj;
|
||||
{
|
||||
rb_secure(4);
|
||||
if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
|
||||
}
|
||||
|
||||
static VALUE
|
||||
rb_gdbm_delete(obj, keystr)
|
||||
VALUE obj, keystr;
|
||||
|
@ -395,7 +403,7 @@ rb_gdbm_delete(obj, keystr)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
StringValue(keystr);
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
key.dsize = RSTRING(keystr)->len;
|
||||
|
@ -436,7 +444,7 @@ fgdbm_shift(obj)
|
|||
GDBM_FILE dbm;
|
||||
VALUE keystr, valstr;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
|
@ -458,7 +466,7 @@ fgdbm_delete_if(obj)
|
|||
VALUE ret, ary = rb_ary_new();
|
||||
int i, status = 0, n;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
n = dbmp->di_size;
|
||||
|
@ -489,7 +497,7 @@ fgdbm_clear(obj)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
dbmp->di_size = -1;
|
||||
|
@ -588,7 +596,7 @@ fgdbm_store(obj, keystr, valstr)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
StringValue(keystr);
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
key.dsize = RSTRING(keystr)->len;
|
||||
|
@ -830,7 +838,7 @@ fgdbm_reorganize(obj)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
gdbm_reorganize(dbm);
|
||||
|
@ -844,7 +852,7 @@ fgdbm_sync(obj)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
gdbm_sync(dbm);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue