various signed/unsigned mismatch nits

p4raw-id: //depot/perl@16173

diff --git a/ext/B/B.xs b/ext/B/B.xs
index 6392b9b..111116a 100644 (file)
--- a/ext/B/B.xs
+++ b/ext/B/B.xs
@@ -668,7 +668,7 @@ OP_ppaddr(o)
     CODE:
        sv_setpvn(sv, "PL_ppaddr[OP_", 13);
        sv_catpv(sv, PL_op_name[o->op_type]);
-       for (i=13; i<SvCUR(sv); ++i)
+       for (i=13; (STRLEN)i < SvCUR(sv); ++i)
            SvPVX(sv)[i] = toUPPER(SvPVX(sv)[i]);
        sv_catpv(sv, "]");
        ST(0) = sv;

diff --git a/ext/ByteLoader/ByteLoader.xs b/ext/ByteLoader/ByteLoader.xs
index d559bfe..4588b02 100644 (file)
--- a/ext/ByteLoader/ByteLoader.xs
+++ b/ext/ByteLoader/ByteLoader.xs
@@ -11,7 +11,7 @@ int
 bl_getc(struct byteloader_fdata *data)
 {
     dTHX;
-    if (SvCUR(data->datasv) <= data->next_out) {
+    if (SvCUR(data->datasv) <= (STRLEN)data->next_out) {
       int result;
       /* Run out of buffered data, so attempt to read some more */
       *(SvPV_nolen (data->datasv)) = '\0';

diff --git a/ext/Data/Dumper/Dumper.xs b/ext/Data/Dumper/Dumper.xs
index 19037a8..383707a 100644 (file)
--- a/ext/Data/Dumper/Dumper.xs
+++ b/ext/Data/Dumper/Dumper.xs
@@ -147,10 +147,10 @@ esc_q_utf8(pTHX_ SV* sv, register char *src, register STRLEN slen)
 
             if (k == '"' || k == '\\' || k == '$' || k == '@') {
                 *r++ = '\\';
-                *r++ = k;
+                *r++ = (char)k;
             }
             else if (k < 0x80)
-                *r++ = k;
+                *r++ = (char)k;
             else {
                 r += sprintf(r, "\\x{%"UVxf"}", k);
             }

diff --git a/ext/Devel/DProf/DProf.xs b/ext/Devel/DProf/DProf.xs
index 3380d78..2219bd2 100644 (file)
--- a/ext/Devel/DProf/DProf.xs
+++ b/ext/Devel/DProf/DProf.xs
@@ -632,7 +632,7 @@ BOOT:
          * while we do this.
          */
         {
-           I32 warn_tmp = PL_dowarn;
+           bool warn_tmp = PL_dowarn;
            PL_dowarn = 0;
            newXS("DB::sub", XS_DB_sub, file);
            newXS("DB::goto", XS_DB_goto, file);

diff --git a/ext/Digest/MD5/MD5.xs b/ext/Digest/MD5/MD5.xs
index 5828df3..0852e52 100644 (file)
--- a/ext/Digest/MD5/MD5.xs
+++ b/ext/Digest/MD5/MD5.xs
@@ -80,10 +80,10 @@ extern "C" {
 #ifndef BYTESWAP
 static void u2s(U32 u, U8* s)
 {
-    *s++ = u         & 0xFF;
-    *s++ = (u >>  8) & 0xFF;
-    *s++ = (u >> 16) & 0xFF;
-    *s   = (u >> 24) & 0xFF;
+    *s++ = (U8)(u         & 0xFF);
+    *s++ = (U8)((u >>  8) & 0xFF);
+    *s++ = (U8)((u >> 16) & 0xFF);
+    *s   = (U8)((u >> 24) & 0xFF);
 }
 
 #define s2u(s,u) ((u) =  (U32)(*s)            |  \

diff --git a/ext/Encode/Unicode/Unicode.xs b/ext/Encode/Unicode/Unicode.xs
index 4689b49..3df25a7 100644 (file)
--- a/ext/Encode/Unicode/Unicode.xs
+++ b/ext/Encode/Unicode/Unicode.xs
@@ -61,7 +61,7 @@ enc_pack(pTHX_ SV *result,STRLEN size,U8 endian,UV value)
        d += SvCUR(result);
        SvCUR_set(result,SvCUR(result)+size);
        while (size--) {
-           *d++ = value & 0xFF;
+           *d++ = (U8)(value & 0xFF);
            value >>= 8;
        }
        break;
@@ -70,7 +70,7 @@ enc_pack(pTHX_ SV *result,STRLEN size,U8 endian,UV value)
        SvCUR_set(result,SvCUR(result)+size);
        d += SvCUR(result);
        while (size--) {
-           *--d = value & 0xFF;
+           *--d = (U8)(value & 0xFF);
            value >>= 8;
        }
        break;

diff --git a/ext/File/Glob/bsd_glob.c b/ext/File/Glob/bsd_glob.c
index 14af31c..7ec58aa 100644 (file)
--- a/ext/File/Glob/bsd_glob.c
+++ b/ext/File/Glob/bsd_glob.c
@@ -520,7 +520,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
        /* Copy up to the end of the string or / */
        eb = &patbuf[patbuf_len - 1];
        for (p = pattern + 1, h = (char *) patbuf;
-            h < (char*)eb && *p && *p != BG_SLASH; *h++ = *p++)
+            h < (char*)eb && *p && *p != BG_SLASH; *h++ = (char)*p++)
                ;
 
        *h = BG_EOS;
@@ -1164,7 +1164,7 @@ static int
 g_Ctoc(register const Char *str, char *buf, STRLEN len)
 {
        while (len--) {
-               if ((*buf++ = *str++) == BG_EOS)
+               if ((*buf++ = (char)*str++) == BG_EOS)
                        return (0);
        }
        return (1);

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index 7edbf2c..26b332b 100644 (file)
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -242,7 +242,7 @@ PPCODE:
     for(i=1, j=0  ; j < nfd ; j++) {
        fds[j].fd = SvIV(ST(i));
        i++;
-       fds[j].events = SvIV(ST(i));
+       fds[j].events = (short)SvIV(ST(i));
        i++;
        fds[j].revents = 0;
     }

diff --git a/ext/Opcode/Opcode.xs b/ext/Opcode/Opcode.xs
index 6ad7107..66710ed 100644 (file)
--- a/ext/Opcode/Opcode.xs
+++ b/ext/Opcode/Opcode.xs
@@ -151,7 +151,7 @@ verify_opset(pTHX_ SV *opset, int fatal)
 
     if      (!SvOK(opset))              err = "undefined";
     else if (!SvPOK(opset))             err = "wrong type";
-    else if (SvCUR(opset) != opset_len) err = "wrong size";
+    else if (SvCUR(opset) != (STRLEN)opset_len) err = "wrong size";
     if (err && fatal) {
        croak("Invalid opset: %s", err);
     }
@@ -178,7 +178,7 @@ set_opset_bits(pTHX_ char *bitmap, SV *bitspec, int on, char *opname)
        else
            bitmap[offset] &= ~(1 << bit);
     }
-    else if (SvPOK(bitspec) && SvCUR(bitspec) == opset_len) {
+    else if (SvPOK(bitspec) && SvCUR(bitspec) == (STRLEN)opset_len) {
 
        STRLEN len;
        char *specbits = SvPV(bitspec, len);
@@ -464,7 +464,7 @@ PPCODE:
                croak("panic: opcode %d (%s) out of range",myopcode,opname);
            XPUSHs(sv_2mortal(newSVpv(op_desc[myopcode], 0)));
        }
-       else if (SvPOK(bitspec) && SvCUR(bitspec) == opset_len) {
+       else if (SvPOK(bitspec) && SvCUR(bitspec) == (STRLEN)opset_len) {
            int b, j;
            STRLEN n_a;
            char *bitmap = SvPV(bitspec,n_a);

diff --git a/ext/PerlIO/encoding/encoding.xs b/ext/PerlIO/encoding/encoding.xs
index c35e3b9..bff16e7 100644 (file)
--- a/ext/PerlIO/encoding/encoding.xs
+++ b/ext/PerlIO/encoding/encoding.xs
@@ -317,7 +317,7 @@ PerlIOEncode_fill(pTHX_ PerlIO * f)
            if (SvLEN(e->dataSV) && SvPVX(e->dataSV)) {
                Safefree(SvPVX(e->dataSV));
            }
-           if (use > e->base.bufsiz) {
+           if (use > (SSize_t)e->base.bufsiz) {
                if (e->flags & NEEDS_LINES) {
                    /* Have to grow buffer */
                    e->base.bufsiz = use;
@@ -427,7 +427,7 @@ PerlIOEncode_flush(pTHX_ PerlIO * f)
            PUTBACK;
            s = SvPV(str, len);
            count = PerlIO_write(PerlIONext(f),s,len);
-           if (count != len) {
+           if ((STRLEN)count != len) {
                code = -1;
            }
            FREETMPS;
@@ -447,7 +447,7 @@ PerlIOEncode_flush(pTHX_ PerlIO * f)
            if (e->dataSV && SvCUR(e->dataSV)) {
                s = SvPV(e->dataSV, len);
                count = PerlIO_unread(PerlIONext(f),s,len);
-               if (count != len) {
+               if ((STRLEN)count != len) {
                    code = -1;
                }
            }
@@ -478,7 +478,7 @@ PerlIOEncode_flush(pTHX_ PerlIO * f)
                PUTBACK;
                s = SvPV(str, len);
                count = PerlIO_unread(PerlIONext(f),s,len);
-               if (count != len) {
+               if ((STRLEN)count != len) {
                    code = -1;
                }
                FREETMPS;

diff --git a/ext/Storable/Storable.xs b/ext/Storable/Storable.xs
index 2e49754..d3cb807 100644 (file)
--- a/ext/Storable/Storable.xs
+++ b/ext/Storable/Storable.xs
@@ -2695,7 +2695,7 @@ static int store_hook(
                PUTMARK(clen);
        }
        if (len2)
-               WRITE(pv, len2);        /* Final \0 is omitted */
+               WRITE(pv, (SSize_t)len2);       /* Final \0 is omitted */
 
        /* [<len3> <object-IDs>] */
        if (flags & SHF_HAS_LIST) {
@@ -3059,7 +3059,7 @@ static int magic_write(stcxt_t *cxt)
                  : -1));
 
        if (cxt->fio)
-               WRITE(magicstr, strlen(magicstr));      /* Don't write final \0 */
+               WRITE(magicstr, (SSize_t)strlen(magicstr));     /* Don't write final \0 */
 
        /*
         * Starting with 0.6, the "use_network_order" byte flag is also used to
@@ -3085,7 +3085,7 @@ static int magic_write(stcxt_t *cxt)
        sprintf(buf, "%lx", (unsigned long) BYTEORDER);
        c = (unsigned char) strlen(buf);
        PUTMARK(c);
-       WRITE(buf, (unsigned int) c);           /* Don't write final \0 */
+       WRITE(buf, (SSize_t)c);         /* Don't write final \0 */
        PUTMARK((unsigned char) sizeof(int));
        PUTMARK((unsigned char) sizeof(long));
        PUTMARK((unsigned char) sizeof(char *));
@@ -4479,7 +4479,7 @@ static SV *retrieve_hash(stcxt_t *cxt, char *cname)
                 */
 
                RLEN(size);                                             /* Get key size */
-               KBUFCHK(size);                                  /* Grow hash key read pool if needed */
+               KBUFCHK((STRLEN)size);                                  /* Grow hash key read pool if needed */
                if (size)
                        READ(kbuf, size);
                kbuf[size] = '\0';                              /* Mark string end, just in case */
@@ -4609,7 +4609,7 @@ static SV *retrieve_flag_hash(stcxt_t *cxt, char *cname)
 #endif
 
             RLEN(size);                                                /* Get key size */
-            KBUFCHK(size);                                     /* Grow hash key read pool if needed */
+            KBUFCHK((STRLEN)size);                             /* Grow hash key read pool if needed */
             if (size)
                 READ(kbuf, size);
             kbuf[size] = '\0';                         /* Mark string end, just in case */
@@ -4773,7 +4773,7 @@ static SV *old_retrieve_hash(stcxt_t *cxt, char *cname)
                if (c != SX_KEY)
                        (void) retrieve_other((stcxt_t *) 0, 0);        /* Will croak out */
                RLEN(size);                                             /* Get key size */
-               KBUFCHK(size);                                  /* Grow hash key read pool if needed */
+               KBUFCHK((STRLEN)size);                                  /* Grow hash key read pool if needed */
                if (size)
                        READ(kbuf, size);
                kbuf[size] = '\0';                              /* Mark string end, just in case */
@@ -4826,7 +4826,7 @@ static SV *magic_check(stcxt_t *cxt)
                STRLEN len = sizeof(magicstr) - 1;
                STRLEN old_len;
 
-               READ(buf, len);                                 /* Not null-terminated */
+               READ(buf, (SSize_t)len);                        /* Not null-terminated */
                buf[len] = '\0';                                /* Is now */
 
                if (0 == strcmp(buf, magicstr))
@@ -4838,7 +4838,7 @@ static SV *magic_check(stcxt_t *cxt)
                 */
 
                old_len = sizeof(old_magicstr) - 1;
-               READ(&buf[len], old_len - len);
+               READ(&buf[len], (SSize_t)(old_len - len));
                buf[old_len] = '\0';                    /* Is now null-terminated */
 
                if (strcmp(buf, old_magicstr))
@@ -5065,7 +5065,7 @@ first_time:               /* Will disappear when support for old format is dropped */
                        default:
                                return (SV *) 0;                /* Failed */
                        }
-                       KBUFCHK(len);                           /* Grow buffer as necessary */
+                       KBUFCHK((STRLEN)len);                   /* Grow buffer as necessary */
                        if (len)
                                READ(kbuf, len);
                        kbuf[len] = '\0';                       /* Mark string end */

diff --git a/ext/Time/HiRes/HiRes.xs b/ext/Time/HiRes/HiRes.xs
index 5292231..9d3586d 100644 (file)
--- a/ext/Time/HiRes/HiRes.xs
+++ b/ext/Time/HiRes/HiRes.xs
@@ -618,7 +618,7 @@ sleep(...)
        if (items > 0) {
            NV seconds  = SvNV(ST(0));
            if (seconds >= 0.0) {
-                UV useconds = 1E6 * (seconds - (UV)seconds);
+                UV useconds = (UV)(1E6 * (seconds - (UV)seconds));
                 if (seconds >= 1.0)
                     sleep((UV)seconds);
                 usleep(useconds);

diff --git a/regcomp.c b/regcomp.c
index 6388c7d..50ea031 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -4775,7 +4775,6 @@ Perl_regprop(pTHX_ SV *sv, regnode *o)
        
            if (lv) {
                if (sw) {
-                   UV i;
                    U8 s[UTF8_MAXLEN+1];
                
                    for (i = 0; i <= 256; i++) { /* just the first 256 */