Change 32703 by [EMAIL PROTECTED] on 2007/12/22 16:17:01
Subject: [PATCH] ext/ consting
From: "Robin Barker" <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Date: Sat, 22 Dec 2007 00:39:47 -0000
Affected files ...
... //depot/perl/ext/Devel/Peek/Peek.xs#28 edit
... //depot/perl/ext/DynaLoader/dl_aix.xs#36 edit
... //depot/perl/ext/DynaLoader/dl_beos.xs#11 edit
... //depot/perl/ext/DynaLoader/dl_dld.xs#17 edit
... //depot/perl/ext/DynaLoader/dl_dllload.xs#4 edit
... //depot/perl/ext/DynaLoader/dl_dlopen.xs#26 edit
... //depot/perl/ext/DynaLoader/dl_dyld.xs#10 edit
... //depot/perl/ext/DynaLoader/dl_hpux.xs#17 edit
... //depot/perl/ext/DynaLoader/dl_mac.xs#7 edit
... //depot/perl/ext/DynaLoader/dl_mpeix.xs#14 edit
... //depot/perl/ext/DynaLoader/dl_next.xs#22 edit
... //depot/perl/ext/DynaLoader/dl_symbian.xs#3 edit
... //depot/perl/ext/DynaLoader/dl_vmesa.xs#9 edit
... //depot/perl/ext/DynaLoader/dl_vms.xs#23 edit
... //depot/perl/ext/GDBM_File/typemap#16 edit
... //depot/perl/ext/IPC/SysV/SysV.xs#20 edit
... //depot/perl/ext/POSIX/POSIX.xs#149 edit
... //depot/perl/ext/PerlIO/via/via.xs#15 edit
... //depot/perl/ext/SDBM_File/sdbm/hash.c#7 edit
... //depot/perl/ext/SDBM_File/sdbm/pair.c#14 edit
... //depot/perl/ext/SDBM_File/sdbm/sdbm.h#19 edit
... //depot/perl/ext/Socket/Socket.xs#64 edit
... //depot/perl/ext/re/re.xs#51 edit
Differences ...
==== //depot/perl/ext/Devel/Peek/Peek.xs#28 (text) ====
Index: perl/ext/Devel/Peek/Peek.xs
--- perl/ext/Devel/Peek/Peek.xs#27~31430~ 2007-06-20 09:26:01.000000000
-0700
+++ perl/ext/Devel/Peek/Peek.xs 2007-12-22 08:17:01.000000000 -0800
@@ -321,7 +321,7 @@
void
mstat(str="Devel::Peek::mstat: ")
-char *str
+const char *str
void
fill_mstats(SV *sv, int level = 0)
==== //depot/perl/ext/DynaLoader/dl_aix.xs#36 (text) ====
Index: perl/ext/DynaLoader/dl_aix.xs
--- perl/ext/DynaLoader/dl_aix.xs#35~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_aix.xs 2007-12-22 08:17:01.000000000 -0800
@@ -744,7 +744,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_beos.xs#11 (text) ====
Index: perl/ext/DynaLoader/dl_beos.xs
--- perl/ext/DynaLoader/dl_beos.xs#10~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_beos.xs 2007-12-22 08:17:01.000000000 -0800
@@ -98,7 +98,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_dld.xs#17 (text) ====
Index: perl/ext/DynaLoader/dl_dld.xs
--- perl/ext/DynaLoader/dl_dld.xs#16~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_dld.xs 2007-12-22 08:17:01.000000000 -0800
@@ -169,7 +169,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_dllload.xs#4 (text) ====
Index: perl/ext/DynaLoader/dl_dllload.xs
--- perl/ext/DynaLoader/dl_dllload.xs#3~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_dllload.xs 2007-12-22 08:17:01.000000000 -0800
@@ -170,7 +170,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_dlopen.xs#26 (text) ====
Index: perl/ext/DynaLoader/dl_dlopen.xs
--- perl/ext/DynaLoader/dl_dlopen.xs#25~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_dlopen.xs 2007-12-22 08:17:01.000000000 -0800
@@ -246,7 +246,7 @@
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)));
==== //depot/perl/ext/DynaLoader/dl_dyld.xs#10 (text) ====
Index: perl/ext/DynaLoader/dl_dyld.xs
--- perl/ext/DynaLoader/dl_dyld.xs#9~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_dyld.xs 2007-12-22 08:17:01.000000000 -0800
@@ -201,7 +201,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_hpux.xs#17 (text) ====
Index: perl/ext/DynaLoader/dl_hpux.xs
--- perl/ext/DynaLoader/dl_hpux.xs#16~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_hpux.xs 2007-12-22 08:17:01.000000000 -0800
@@ -160,7 +160,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_mac.xs#7 (text) ====
Index: perl/ext/DynaLoader/dl_mac.xs
--- perl/ext/DynaLoader/dl_mac.xs#6~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_mac.xs 2007-12-22 08:17:01.000000000 -0800
@@ -126,7 +126,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_mpeix.xs#14 (text) ====
Index: perl/ext/DynaLoader/dl_mpeix.xs
--- perl/ext/DynaLoader/dl_mpeix.xs#13~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_mpeix.xs 2007-12-22 08:17:01.000000000 -0800
@@ -111,7 +111,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_next.xs#22 (text) ====
Index: perl/ext/DynaLoader/dl_next.xs
--- perl/ext/DynaLoader/dl_next.xs#21~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_next.xs 2007-12-22 08:17:01.000000000 -0800
@@ -301,7 +301,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_symbian.xs#3 (text) ====
Index: perl/ext/DynaLoader/dl_symbian.xs
--- perl/ext/DynaLoader/dl_symbian.xs#2~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_symbian.xs 2007-12-22 08:17:01.000000000 -0800
@@ -205,7 +205,7 @@
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,
==== //depot/perl/ext/DynaLoader/dl_vmesa.xs#9 (text) ====
Index: perl/ext/DynaLoader/dl_vmesa.xs
--- perl/ext/DynaLoader/dl_vmesa.xs#8~28063~ 2006-05-02 08:55:25.000000000
-0700
+++ perl/ext/DynaLoader/dl_vmesa.xs 2007-12-22 08:17:01.000000000 -0800
@@ -156,7 +156,7 @@
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));
==== //depot/perl/ext/DynaLoader/dl_vms.xs#23 (text) ====
Index: perl/ext/DynaLoader/dl_vms.xs
--- perl/ext/DynaLoader/dl_vms.xs#22~28318~ 2006-05-27 11:00:31.000000000
-0700
+++ perl/ext/DynaLoader/dl_vms.xs 2007-12-22 08:17:01.000000000 -0800
@@ -367,7 +367,7 @@
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));
==== //depot/perl/ext/GDBM_File/typemap#16 (text) ====
Index: perl/ext/GDBM_File/typemap
--- perl/ext/GDBM_File/typemap#15~21981~ 2003-12-27 12:14:09.000000000
-0800
+++ perl/ext/GDBM_File/typemap 2007-12-22 08:17:01.000000000 -0800
@@ -37,7 +37,8 @@
$var.dsize = (int)PL_na;
}
else {
- $var.dptr = \"\";
+ $var.dptr = (char *)\"\";
+ /* better would be for .dptr to be const char * */
$var.dsize = 0;
}
OUTPUT
==== //depot/perl/ext/IPC/SysV/SysV.xs#20 (text) ====
Index: perl/ext/IPC/SysV/SysV.xs
--- perl/ext/IPC/SysV/SysV.xs#19~32077~ 2007-10-09 05:00:27.000000000 -0700
+++ perl/ext/IPC/SysV/SysV.xs 2007-12-22 08:17:01.000000000 -0800
@@ -222,7 +222,7 @@
/*
* 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 @@
{"S_IRWXO", S_IRWXO},
#endif
{Nullch,0}};
- char *name;
+ const char *name;
int i;
for(i = 0 ; (name = IPC__SysV__const[i].n) ; i++) {
==== //depot/perl/ext/POSIX/POSIX.xs#149 (text) ====
Index: perl/ext/POSIX/POSIX.xs
--- perl/ext/POSIX/POSIX.xs#148~31482~ 2007-06-27 10:08:01.000000000 -0700
+++ perl/ext/POSIX/POSIX.xs 2007-12-22 08:17:01.000000000 -0800
@@ -582,7 +582,7 @@
POSIX::SigSet
new(packname = "POSIX::SigSet", ...)
- char * packname
+ const char * packname
CODE:
{
int i;
@@ -627,7 +627,7 @@
POSIX::Termios
new(packname = "POSIX::Termios", ...)
- char * packname
+ const char * packname
CODE:
{
#ifdef I_TERMIOS
==== //depot/perl/ext/PerlIO/via/via.xs#15 (text) ====
Index: perl/ext/PerlIO/via/via.xs
--- perl/ext/PerlIO/via/via.xs#14~29977~ 2007-01-25 12:57:56.000000000
-0800
+++ perl/ext/PerlIO/via/via.xs 2007-12-22 08:17:01.000000000 -0800
@@ -41,7 +41,7 @@
#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 @@
*/
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);
==== //depot/perl/ext/SDBM_File/sdbm/hash.c#7 (text) ====
Index: perl/ext/SDBM_File/sdbm/hash.c
--- perl/ext/SDBM_File/sdbm/hash.c#6~854~ 1998-04-02 08:03:37.000000000
-0800
+++ perl/ext/SDBM_File/sdbm/hash.c 2007-12-22 08:17:01.000000000 -0800
@@ -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;
==== //depot/perl/ext/SDBM_File/sdbm/pair.c#14 (text) ====
Index: perl/ext/SDBM_File/sdbm/pair.c
--- perl/ext/SDBM_File/sdbm/pair.c#13~5008~ 2000-02-06 11:28:31.000000000
-0800
+++ perl/ext/SDBM_File/sdbm/pair.c 2007-12-22 08:17:01.000000000 -0800
@@ -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 @@
* 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;
==== //depot/perl/ext/SDBM_File/sdbm/sdbm.h#19 (text) ====
Index: perl/ext/SDBM_File/sdbm/sdbm.h
--- perl/ext/SDBM_File/sdbm/sdbm.h#18~21433~ 2003-10-09 13:57:26.000000000
-0700
+++ perl/ext/SDBM_File/sdbm/sdbm.h 2007-12-22 08:17:01.000000000 -0800
@@ -47,7 +47,7 @@
#define sdbm_pagfno(db) ((db)->pagf)
typedef struct {
- char *dptr;
+ const char *dptr;
int dsize;
} datum;
@@ -85,7 +85,7 @@
* 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
==== //depot/perl/ext/Socket/Socket.xs#64 (text) ====
Index: perl/ext/Socket/Socket.xs
--- perl/ext/Socket/Socket.xs#63~31138~ 2007-05-04 07:02:26.000000000 -0700
+++ perl/ext/Socket/Socket.xs 2007-12-22 08:17:01.000000000 -0800
@@ -182,7 +182,7 @@
static int
-not_here(char *s)
+not_here(const char *s)
{
croak("Socket::%s not implemented on this architecture", s);
return -1;
==== //depot/perl/ext/re/re.xs#51 (text) ====
Index: perl/ext/re/re.xs
--- perl/ext/re/re.xs#50~31409~ 2007-06-18 00:39:35.000000000 -0700
+++ perl/ext/re/re.xs 2007-12-22 08:17:01.000000000 -0800
@@ -105,7 +105,7 @@
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);
End of Patch.
