packages: qdbm/qdbm-ruby1.9.patch - more

[baggins]

Author: baggins                      Date: Mon Mar  1 15:54:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more

---- Files affected:
packages/qdbm:
   qdbm-ruby1.9.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/qdbm/qdbm-ruby1.9.patch
diff -u packages/qdbm/qdbm-ruby1.9.patch:1.2 packages/qdbm/qdbm-ruby1.9.patch:1.3
--- packages/qdbm/qdbm-ruby1.9.patch:1.2	Mon Mar  1 16:48:56 2010
+++ packages/qdbm/qdbm-ruby1.9.patch	Mon Mar  1 16:54:32 2010
@@ -80,3 +80,71 @@
    curia = crtable[index];
    if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
      if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
+--- qdbm-1.8.77/ruby/villa/mod_villa.c~	2006-09-25 16:47:04.000000000 +0200
++++ qdbm-1.8.77/ruby/villa/mod_villa.c	2010-03-01 16:53:12.007186805 +0100
+@@ -353,9 +353,9 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   villa = vltable[index];
+@@ -374,7 +374,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if(!vlout(villa, kbuf, ksiz)){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -392,7 +392,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
+@@ -410,7 +410,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
+@@ -427,7 +427,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   vnum = vlvnum(villa, kbuf, ksiz);
+   return INT2FIX(vnum);
+@@ -498,7 +498,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vjmode);
+   jmode = FIX2INT(vjmode);
+   villa = vltable[index];
+@@ -552,7 +552,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vcpmode);
+   cpmode = FIX2INT(vcpmode);
+   villa = vltable[index];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qdbm/qdbm-ruby1.9.patch?r1=1.2&r2=1.3&f=u