X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Util.xs;h=6733972275805f09ed91925b6899ffa744afa19e;hb=7534095ac7f4df7767444efaea60afc7f3f70360;hp=2c3cc6e8641d0217f0f457a5f6291d870814b78c;hpb=38cecdc8ec7ee71576580fa90ab61a9285fc5dff;p=perl%2Fmodules%2FScalar-Vec-Util.git

diff --git a/Util.xs b/Util.xs
index 2c3cc6e..6733972 100644
--- a/Util.xs
+++ b/Util.xs
@@ -36,7 +36,7 @@ STATIC size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
 STATIC char *svu_prepare_sv(pTHX_ SV *sv, size_t s, size_t l) {
 #define svu_prepare_sv(S, I, L) svu_prepare_sv(aTHX_ (S), (I), (L))
  STRLEN  c;
- size_t  n = s + l, i, j1, j2, k, z;
+ size_t  n = s + l, i, js, jz, k, z;
  char   *p;
 
  SvUPGRADE(sv, SVt_PV);
@@ -44,15 +44,15 @@ STATIC char *svu_prepare_sv(pTHX_ SV *sv, size_t s, size_t l) {
  p = SvGROW(sv, BV_SIZE(n));
  c = SvCUR(sv);
 
- j1 = (s / BITS(BV_UNIT)) * sizeof(BV_UNIT);
- k  = j1 + sizeof(BV_UNIT);
- for (i = c < j1 ? j1 : c; i < k; ++i)
+ js = (s / BITS(BV_UNIT)) * sizeof(BV_UNIT);
+ k  = js + sizeof(BV_UNIT);
+ for (i = c < js ? js : c; i < k; ++i)
   p[i] = 0;
 
- j2 = ((s + l - 1) / BITS(BV_UNIT)) * sizeof(BV_UNIT);
- if (j2 > j1) {
-  k = j2 + sizeof(BV_UNIT);
-  for (i = c < j2 ? j2 : c; i < k; ++i)
+ jz = ((s + l - 1) / BITS(BV_UNIT)) * sizeof(BV_UNIT);
+ if (jz > js) {
+  k = jz + sizeof(BV_UNIT);
+  for (i = c < jz ? jz : c; i < k; ++i)
    p[i] = 0;
  }
 
@@ -128,7 +128,7 @@ CODE:
 
  XSRETURN(0);
 
-SV *
+void
 veq(SV *sv1, SV *ss1, SV *sv2, SV *ss2, SV *sl)
 PROTOTYPE: $$$$$
 PREINIT:
@@ -138,7 +138,7 @@ PREINIT:
 CODE:
  l = svu_validate_uv(sl, "length");
  if (!l)
-  XSRETURN_YES;
+  goto done;
  s1 = svu_validate_uv(ss1, "offset");
  s2 = svu_validate_uv(ss2, "offset");
 
@@ -182,6 +182,5 @@ CODE:
  }
 
  done:
- RETVAL = newSVuv(res);
-OUTPUT:
- RETVAL
+ ST(0) = res ? &PL_sv_yes : &PL_sv_no;
+ XSRETURN(1);