Change 25642: Casts to fix warnings in gv.c, locale.c and mg.c

[Nicholas Clark]

Change 25642 by [EMAIL PROTECTED] on 2005/09/28 20:27:21

        Casts to fix warnings in gv.c, locale.c and mg.c

Affected files ...

... //depot/maint-5.8/perl/gv.c#54 edit
... //depot/maint-5.8/perl/locale.c#14 edit
... //depot/maint-5.8/perl/mg.c#83 edit
... //depot/maint-5.8/perl/utf8.h#10 edit

Differences ...

==== //depot/maint-5.8/perl/gv.c#54 (text) ====
Index: perl/gv.c
--- perl/gv.c#53~25577~ Fri Sep 23 05:25:23 2005
+++ perl/gv.c   Wed Sep 28 13:27:21 2005
@@ -1178,7 +1178,7 @@
 Perl_gv_efullname4(pTHX_ SV *sv, GV *gv, const char *prefix, bool keepmain)
 {
     const GV * const egv = GvEGV(gv);
-    gv_fullname4(sv, egv ? egv : gv, prefix, keepmain);
+    gv_fullname4(sv, (GV *) (egv ? egv : gv), prefix, keepmain);
 }
 
 void

==== //depot/maint-5.8/perl/locale.c#14 (text) ====
Index: perl/locale.c
--- perl/locale.c#13~25572~     Thu Sep 22 09:46:28 2005
+++ perl/locale.c       Wed Sep 28 13:27:21 2005
@@ -524,7 +524,7 @@
        This is an alternative to using the -C command line switch
        (the -C if present will override this). */
     {
-        const char *p = PerlEnv_getenv("PERL_UNICODE");
+        char *p = PerlEnv_getenv("PERL_UNICODE");
         PL_unicode = p ? parse_unicode_opts(&p) : 0;
     }
 #endif

==== //depot/maint-5.8/perl/mg.c#83 (text) ====
Index: perl/mg.c
--- perl/mg.c#82~25584~ Fri Sep 23 07:26:21 2005
+++ perl/mg.c   Wed Sep 28 13:27:21 2005
@@ -265,7 +265,7 @@
 
     if (DO_UTF8(sv)) {
         const U8 *s = (U8*)SvPV_const(sv, len);
-        len = Perl_utf8_length(aTHX_ s, s + len);
+        len = Perl_utf8_length(aTHX_ (U8*)s, (U8*)s + len);
     }
     else
         (void)SvPV_const(sv, len);
@@ -961,7 +961,7 @@
 
     s = SvPV_const(sv,len);
     ptr = MgPV_const(mg,klen);
-    my_setenv(ptr, s);
+    my_setenv((char *)ptr, (char *)s);
 
 #ifdef DYNAMIC_ENV_FETCH
      /* We just undefd an environment var.  Is a replacement */
@@ -1012,7 +1012,7 @@
                Stat_t st;
                I32 i;
                s = delimcpy(tmpbuf, tmpbuf + sizeof tmpbuf,
-                            s, strend, ':', &i);
+                            (char *) s, (char *) strend, ':', &i);
                s++;
                if (i >= sizeof tmpbuf   /* too long -- assume the worst */
                      || *tmpbuf != '/'
@@ -1032,7 +1032,7 @@
 Perl_magic_clearenv(pTHX_ SV *sv, MAGIC *mg)
 {
     PERL_UNUSED_ARG(sv);
-    my_setenv(MgPV_nolen_const(mg),Nullch);
+    my_setenv((char *)MgPV_nolen_const(mg),Nullch);
     return 0;
 }
 
@@ -1049,7 +1049,7 @@
        while ((entry = hv_iternext((HV*)sv))) {
            I32 keylen;
            my_setenv(hv_iterkey(entry, &keylen),
-                     SvPV_nolen_const(hv_iterval((HV*)sv, entry)));
+                     (char *)SvPV_nolen_const(hv_iterval((HV*)sv, entry)));
        }
     }
 #endif
@@ -1118,7 +1118,7 @@
 Perl_magic_getsig(pTHX_ SV *sv, MAGIC *mg)
 {
     /* Are we fetching a signal entry? */
-    const I32 i = whichsig(MgPV_nolen_const(mg));
+    const I32 i = whichsig((char *)MgPV_nolen_const(mg));
     if (i > 0) {
        if(PL_psig_ptr[i])
            sv_setsv(sv,PL_psig_ptr[i]);
@@ -1166,7 +1166,7 @@
     }
     else {
        /* Are we clearing a signal entry? */
-       const I32 i = whichsig(s);
+       const I32 i = whichsig((char *)s);
        if (i > 0) {
 #ifdef HAS_SIGPROCMASK
            sigset_t set, save;
@@ -1312,7 +1312,7 @@
        }
     }
     else {
-       i = whichsig(s);        /* ...no, a brick */
+       i = whichsig((char *)s);        /* ...no, a brick */
        if (i <= 0) {
            if (ckWARN(WARN_SIGNAL))
                Perl_warner(aTHX_ packWARN(WARN_SIGNAL), "No such signal: 
SIG%s", s);
@@ -1807,17 +1807,17 @@
     if (DO_UTF8(sv)) {
        sv_utf8_upgrade(lsv);
        sv_pos_u2b(lsv, &lvoff, &lvlen);
-       sv_insert(lsv, lvoff, lvlen, tmps, len);
+       sv_insert(lsv, lvoff, lvlen, (char *)tmps, len);
        SvUTF8_on(lsv);
     }
     else if (lsv && SvUTF8(lsv)) {
        sv_pos_u2b(lsv, &lvoff, &lvlen);
        tmps = (char*)bytes_to_utf8((U8*)tmps, &len);
-       sv_insert(lsv, lvoff, lvlen, tmps, len);
+       sv_insert(lsv, lvoff, lvlen, (char *)tmps, len);
        Safefree(tmps);
     }
     else
-        sv_insert(lsv, lvoff, lvlen, tmps, len);
+        sv_insert(lsv, lvoff, lvlen, (char *)tmps, len);
 
     return 0;
 }

==== //depot/maint-5.8/perl/utf8.h#10 (text) ====
Index: perl/utf8.h
--- perl/utf8.h#9~25503~        Mon Sep 19 14:14:58 2005
+++ perl/utf8.h Wed Sep 28 13:27:21 2005
@@ -149,7 +149,7 @@
  */
 #define isIDFIRST_lazy_if(p,c) ((IN_BYTES || (!c || (*((const U8*)p) < 0xc0))) 
\
                                ? isIDFIRST(*(p)) \
-                               : isIDFIRST_utf8((const U8*)p))
+                               : isIDFIRST_utf8((U8*)p))
 #define isALNUM_lazy_if(p,c)   ((IN_BYTES || (!c || (*((const U8*)p) < 0xc0))) 
\
                                ? isALNUM(*(p)) \
                                : isALNUM_utf8((const U8*)p))
End of Patch.