diff options
| author | Steve Wills <swills@FreeBSD.org> | 2014-03-31 03:26:38 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2014-03-31 03:26:38 +0000 |
| commit | 521524a0ceefe62b066de5bd40170beb3b8e1315 (patch) | |
| tree | 4a2c33ef3b82ded33ae49fe535538bd91771550f /databases/ruby-qdbm/files/patch-villa-mod_villa.c | |
| parent | - Update to 1.1.4. (diff) | |
- Fix STR2CSTR usage [1]
- While here, stage.
PR: ports/188079 [1]
Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> [1]
Notes
Notes:
svn path=/head/; revision=349699
Diffstat (limited to 'databases/ruby-qdbm/files/patch-villa-mod_villa.c')
| -rw-r--r-- | databases/ruby-qdbm/files/patch-villa-mod_villa.c | 60 |
1 files changed, 42 insertions, 18 deletions
diff --git a/databases/ruby-qdbm/files/patch-villa-mod_villa.c b/databases/ruby-qdbm/files/patch-villa-mod_villa.c index 460b73c4eb7b..18f92dce4a46 100644 --- a/databases/ruby-qdbm/files/patch-villa-mod_villa.c +++ b/databases/ruby-qdbm/files/patch-villa-mod_villa.c @@ -1,67 +1,91 @@ ---- villa/mod_villa.c.orig 2011-07-24 16:03:33.000000000 +0000 -+++ villa/mod_villa.c 2011-07-24 16:05:49.000000000 +0000 -@@ -353,9 +353,9 @@ +--- villa/mod_villa.c.orig 2014-03-29 18:35:17.000000000 +0100 ++++ villa/mod_villa.c 2014-03-29 18:37:37.000000000 +0100 +@@ -304,7 +304,7 @@ + int index, omode, cmode; + VLCFUNC cmp; + if((index = getnewindex()) == -1) myerror(DP_EMISC); +- name = STR2CSTR(vname); ++ name = StringValuePtr(vname); + FIXNUM_P(vomode); + omode = FIX2INT(vomode); + FIXNUM_P(vcmode); +@@ -352,10 +352,10 @@ + int index, ksiz, vsiz, dmode; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - kbuf = STR2CSTR(vkey); +- kbuf = STR2CSTR(vkey); - ksiz = RSTRING(vkey)->len; -+ ksiz = RSTRING_LEN(vkey); - vbuf = STR2CSTR(vval); +- vbuf = STR2CSTR(vval); - vsiz = RSTRING(vval)->len; ++ kbuf = StringValuePtr(vkey); ++ ksiz = RSTRING_LEN(vkey); ++ vbuf = StringValuePtr(vval); + vsiz = RSTRING_LEN(vval); FIXNUM_P(vdmode); dmode = FIX2INT(vdmode); villa = vltable[index]; -@@ -374,7 +374,7 @@ +@@ -373,8 +373,8 @@ + int index, ksiz; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - kbuf = STR2CSTR(vkey); +- kbuf = STR2CSTR(vkey); - ksiz = RSTRING(vkey)->len; ++ kbuf = StringValuePtr(vkey); + ksiz = RSTRING_LEN(vkey); villa = vltable[index]; if(!vlout(villa, kbuf, ksiz)){ if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse; -@@ -392,7 +392,7 @@ +@@ -391,8 +391,8 @@ + VALUE vval; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - kbuf = STR2CSTR(vkey); +- kbuf = STR2CSTR(vkey); - ksiz = RSTRING(vkey)->len; ++ kbuf = StringValuePtr(vkey); + 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 @@ +@@ -409,8 +409,8 @@ + int index, ksiz, vsiz; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - kbuf = STR2CSTR(vkey); +- kbuf = STR2CSTR(vkey); - ksiz = RSTRING(vkey)->len; ++ kbuf = StringValuePtr(vkey); + 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 @@ +@@ -426,8 +426,8 @@ + int index, ksiz, vnum; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - kbuf = STR2CSTR(vkey); +- kbuf = STR2CSTR(vkey); - ksiz = RSTRING(vkey)->len; ++ kbuf = StringValuePtr(vkey); + ksiz = RSTRING_LEN(vkey); villa = vltable[index]; vnum = vlvnum(villa, kbuf, ksiz); return INT2FIX(vnum); -@@ -498,7 +498,7 @@ +@@ -497,8 +497,8 @@ + VALUE vval; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - kbuf = STR2CSTR(vkey); +- kbuf = STR2CSTR(vkey); - ksiz = RSTRING(vkey)->len; ++ kbuf = StringValuePtr(vkey); + ksiz = RSTRING_LEN(vkey); FIXNUM_P(vjmode); jmode = FIX2INT(vjmode); villa = vltable[index]; -@@ -552,7 +552,7 @@ +@@ -551,8 +551,8 @@ + int index, vsiz, cpmode; FIXNUM_P(vindex); if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC); - vbuf = STR2CSTR(vval); +- vbuf = STR2CSTR(vval); - vsiz = RSTRING(vval)->len; ++ vbuf = StringValuePtr(vval); + vsiz = RSTRING_LEN(vval); FIXNUM_P(vcpmode); cpmode = FIX2INT(vcpmode); |