From: Robin Barker Date: Sat, 22 Dec 2007 00:39:47 +0000 (+0000) Subject: ext/ consting X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d3f5e39945c1adca90422be3853d860ba9478c11;p=p5sagit%2Fp5-mst-13.2.git ext/ consting From: "Robin Barker" Message-ID: <46A0F33545E63740BC7563DE59CA9C6D09399D@exchsvr2.npl.ad.local> Date: Sat, 22 Dec 2007 00:39:47 -0000 p4raw-id: //depot/perl@32703 --- diff --git a/ext/Devel/Peek/Peek.xs b/ext/Devel/Peek/Peek.xs index f07c2e5..cf47c3c 100644 --- a/ext/Devel/Peek/Peek.xs +++ b/ext/Devel/Peek/Peek.xs @@ -321,7 +321,7 @@ MODULE = Devel::Peek PACKAGE = Devel::Peek void mstat(str="Devel::Peek::mstat: ") -char *str +const char *str void fill_mstats(SV *sv, int level = 0) diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs index 8529097..c91a2fc 100644 --- a/ext/DynaLoader/dl_aix.xs +++ b/ext/DynaLoader/dl_aix.xs @@ -744,7 +744,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_beos.xs b/ext/DynaLoader/dl_beos.xs index ae40269..3453d68 100644 --- a/ext/DynaLoader/dl_beos.xs +++ b/ext/DynaLoader/dl_beos.xs @@ -98,7 +98,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%lx)\n", perl_name, (unsigned long) symref)); diff --git a/ext/DynaLoader/dl_dld.xs b/ext/DynaLoader/dl_dld.xs index 127c0d1..ab72ca3 100644 --- a/ext/DynaLoader/dl_dld.xs +++ b/ext/DynaLoader/dl_dld.xs @@ -169,7 +169,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_dllload.xs b/ext/DynaLoader/dl_dllload.xs index c5ce35a..61611d7 100644 --- a/ext/DynaLoader/dl_dllload.xs +++ b/ext/DynaLoader/dl_dllload.xs @@ -170,7 +170,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%lx)\n", perl_name, (unsigned long) symref)); diff --git a/ext/DynaLoader/dl_dlopen.xs b/ext/DynaLoader/dl_dlopen.xs index 83f5aed..3332758 100644 --- a/ext/DynaLoader/dl_dlopen.xs +++ b/ext/DynaLoader/dl_dlopen.xs @@ -246,7 +246,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%"UVxf")\n", perl_name, PTR2UV(symref))); diff --git a/ext/DynaLoader/dl_dyld.xs b/ext/DynaLoader/dl_dyld.xs index eac0408..c8f999b 100644 --- a/ext/DynaLoader/dl_dyld.xs +++ b/ext/DynaLoader/dl_dyld.xs @@ -201,7 +201,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_hpux.xs b/ext/DynaLoader/dl_hpux.xs index 0c751dd..f85dea1 100644 --- a/ext/DynaLoader/dl_hpux.xs +++ b/ext/DynaLoader/dl_hpux.xs @@ -160,7 +160,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_mac.xs b/ext/DynaLoader/dl_mac.xs index 826caf2..474cd99 100644 --- a/ext/DynaLoader/dl_mac.xs +++ b/ext/DynaLoader/dl_mac.xs @@ -126,7 +126,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log,"dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_mpeix.xs b/ext/DynaLoader/dl_mpeix.xs index 4b339c5..a73e22a 100644 --- a/ext/DynaLoader/dl_mpeix.xs +++ b/ext/DynaLoader/dl_mpeix.xs @@ -111,7 +111,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log,"dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_next.xs b/ext/DynaLoader/dl_next.xs index e61c800..a7742a1 100644 --- a/ext/DynaLoader/dl_next.xs +++ b/ext/DynaLoader/dl_next.xs @@ -301,7 +301,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/DynaLoader/dl_symbian.xs b/ext/DynaLoader/dl_symbian.xs index b2f2732..f7ddc09 100644 --- a/ext/DynaLoader/dl_symbian.xs +++ b/ext/DynaLoader/dl_symbian.xs @@ -205,7 +205,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: ST(0) = sv_2mortal(newRV((SV*)newXS_flags(perl_name, (void(*)(pTHX_ CV *))symref, diff --git a/ext/DynaLoader/dl_vmesa.xs b/ext/DynaLoader/dl_vmesa.xs index 8b0d756..606c89e 100644 --- a/ext/DynaLoader/dl_vmesa.xs +++ b/ext/DynaLoader/dl_vmesa.xs @@ -156,7 +156,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%lx)\n", perl_name, (unsigned long) symref)); diff --git a/ext/DynaLoader/dl_vms.xs b/ext/DynaLoader/dl_vms.xs index e476663..3ae76b8 100644 --- a/ext/DynaLoader/dl_vms.xs +++ b/ext/DynaLoader/dl_vms.xs @@ -367,7 +367,7 @@ void dl_install_xsub(perl_name, symref, filename="$Package") char * perl_name void * symref - char * filename + const char * filename CODE: DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", perl_name, symref)); diff --git a/ext/GDBM_File/typemap b/ext/GDBM_File/typemap index 8c7cb45..3e69721 100644 --- a/ext/GDBM_File/typemap +++ b/ext/GDBM_File/typemap @@ -37,7 +37,8 @@ T_DATUM_V $var.dsize = (int)PL_na; } else { - $var.dptr = \"\"; + $var.dptr = (char *)\"\"; + /* better would be for .dptr to be const char * */ $var.dsize = 0; } OUTPUT diff --git a/ext/IPC/SysV/SysV.xs b/ext/IPC/SysV/SysV.xs index deaa8e8..b5137cf 100644 --- a/ext/IPC/SysV/SysV.xs +++ b/ext/IPC/SysV/SysV.xs @@ -222,7 +222,7 @@ BOOT: /* * constant subs for IPC::SysV */ - struct { char *n; I32 v; } IPC__SysV__const[] = { + struct { const char *n; I32 v; } IPC__SysV__const[] = { #ifdef GETVAL {"GETVAL", GETVAL}, #endif @@ -434,7 +434,7 @@ BOOT: {"S_IRWXO", S_IRWXO}, #endif {Nullch,0}}; - char *name; + const char *name; int i; for(i = 0 ; (name = IPC__SysV__const[i].n) ; i++) { diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 9ddfd3a..867d35b 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -582,7 +582,7 @@ MODULE = SigSet PACKAGE = POSIX::SigSet PREFIX = sig POSIX::SigSet new(packname = "POSIX::SigSet", ...) - char * packname + const char * packname CODE: { int i; @@ -627,7 +627,7 @@ MODULE = Termios PACKAGE = POSIX::Termios PREFIX = cf POSIX::Termios new(packname = "POSIX::Termios", ...) - char * packname + const char * packname CODE: { #ifdef I_TERMIOS diff --git a/ext/PerlIO/via/via.xs b/ext/PerlIO/via/via.xs index 5670887..b17108c 100644 --- a/ext/PerlIO/via/via.xs +++ b/ext/PerlIO/via/via.xs @@ -41,7 +41,7 @@ typedef struct #define MYMethod(x) #x,&s->x CV * -PerlIOVia_fetchmethod(pTHX_ PerlIOVia * s, char *method, CV ** save) +PerlIOVia_fetchmethod(pTHX_ PerlIOVia * s, const char *method, CV ** save) { GV *gv = gv_fetchmeth(s->stash, method, strlen(method), 0); #if 0 @@ -64,7 +64,7 @@ PerlIOVia_fetchmethod(pTHX_ PerlIOVia * s, char *method, CV ** save) */ SV * -PerlIOVia_method(pTHX_ PerlIO * f, char *method, CV ** save, int flags, +PerlIOVia_method(pTHX_ PerlIO * f, const char *method, CV ** save, int flags, ...) { PerlIOVia *s = PerlIOSelf(f, PerlIOVia); diff --git a/ext/SDBM_File/sdbm/hash.c b/ext/SDBM_File/sdbm/hash.c index 9b27648..7dd1c99 100644 --- a/ext/SDBM_File/sdbm/hash.c +++ b/ext/SDBM_File/sdbm/hash.c @@ -18,7 +18,7 @@ * 65587 even better. */ long -sdbm_hash(register char *str, register int len) +sdbm_hash(register const char *str, register int len) { register unsigned long n = 0; diff --git a/ext/SDBM_File/sdbm/pair.c b/ext/SDBM_File/sdbm/pair.c index 4f0fde2..42b130d 100644 --- a/ext/SDBM_File/sdbm/pair.c +++ b/ext/SDBM_File/sdbm/pair.c @@ -22,7 +22,7 @@ /* * forward */ -static int seepair proto((char *, int, char *, int)); +static int seepair proto((char *, int, const char *, int)); /* * page format: @@ -218,7 +218,7 @@ delpair(char *pag, datum key) * return 0 if not found. */ static int -seepair(char *pag, register int n, register char *key, register int siz) +seepair(char *pag, register int n, register const char *key, register int siz) { register int i; register int off = PBLKSIZ; diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm/sdbm.h index 88e4b66..53fc366 100644 --- a/ext/SDBM_File/sdbm/sdbm.h +++ b/ext/SDBM_File/sdbm/sdbm.h @@ -47,7 +47,7 @@ typedef struct { #define sdbm_pagfno(db) ((db)->pagf) typedef struct { - char *dptr; + const char *dptr; int dsize; } datum; @@ -85,7 +85,7 @@ extern int sdbm_exists proto((DBM *, datum)); * other */ extern DBM *sdbm_prep proto((char *, char *, int, int)); -extern long sdbm_hash proto((char *, int)); +extern long sdbm_hash proto((const char *, int)); #ifndef SDBM_ONLY #define dbm_open sdbm_open diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs index f86c5ae..076297f 100644 --- a/ext/Socket/Socket.xs +++ b/ext/Socket/Socket.xs @@ -182,7 +182,7 @@ my_inet_aton(register const char *cp, struct in_addr *addr) static int -not_here(char *s) +not_here(const char *s) { croak("Socket::%s not implemented on this architecture", s); return -1; diff --git a/ext/re/re.xs b/ext/re/re.xs index b4d3e34..d1001c4 100644 --- a/ext/re/re.xs +++ b/ext/re/re.xs @@ -105,7 +105,7 @@ PPCODE: modifiers" in this scenario. */ - char *fptr = INT_PAT_MODS; + const char *fptr = INT_PAT_MODS; char ch; U16 match_flags = (U16)((re->extflags & PMf_COMPILETIME) >> 12);