From: Gurusamy Sarathy Date: Wed, 2 Jun 1999 04:47:10 +0000 (+0000) Subject: remove _() non-ansism X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=20ce7b12268a3d32b5b246928de5084322e709cf;p=p5sagit%2Fp5-mst-13.2.git remove _() non-ansism p4raw-id: //depot/perl@3518 --- diff --git a/Porting/config_H b/Porting/config_H index e215393..a5af300 100644 --- a/Porting/config_H +++ b/Porting/config_H @@ -581,7 +581,7 @@ /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ @@ -2153,7 +2153,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the telldir() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern long telldir _((DIR*)); + * extern long telldir (DIR*); */ #define HAS_TELLDIR_PROTO /**/ @@ -2492,7 +2492,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the drand48() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern double drand48 _((void)); + * extern double drand48 (void); */ #define HAS_DRAND48_PROTO /**/ diff --git a/XSUB.h b/XSUB.h index 9e82530..0af51d3 100644 --- a/XSUB.h +++ b/XSUB.h @@ -31,7 +31,7 @@ #define dXSFUNCTION(ret) XSINTERFACE_CVT(ret,XSFUNCTION) #define XSINTERFACE_FUNC(ret,cv,f) ((XSINTERFACE_CVT(ret,))(f)) #define XSINTERFACE_FUNC_SET(cv,f) \ - CvXSUBANY(cv).any_dptr = (void (*) _((void*)))(f) + CvXSUBANY(cv).any_dptr = (void (*) (void*))(f) #define XSRETURN(off) \ STMT_START { \ diff --git a/config_h.SH b/config_h.SH index 44d4379..1a7c363 100644 --- a/config_h.SH +++ b/config_h.SH @@ -595,7 +595,7 @@ sed <config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ @@ -2191,7 +2191,7 @@ sed <config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * This symbol, if defined, indicates that the system provides * a prototype for the telldir() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern long telldir _((DIR*)); + * extern long telldir (DIR*); */ #$d_telldirproto HAS_TELLDIR_PROTO /**/ @@ -2536,7 +2536,7 @@ sed <config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * This symbol, if defined, indicates that the system provides * a prototype for the drand48() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern double drand48 _((void)); + * extern double drand48 (void); */ #$d_drand48proto HAS_DRAND48_PROTO /**/ diff --git a/cv.h b/cv.h index cf5a750..482a257 100644 --- a/cv.h +++ b/cv.h @@ -21,7 +21,7 @@ struct xpvcv { HV * xcv_stash; OP * xcv_start; OP * xcv_root; - void (*xcv_xsub) _((CV* _CPERLproto)); + void (*xcv_xsub) (CV* _CPERLproto); ANY xcv_xsubany; GV * xcv_gv; GV * xcv_filegv; diff --git a/doio.c b/doio.c index 7456cef..e9f2a71 100644 --- a/doio.c +++ b/doio.c @@ -27,7 +27,7 @@ #ifdef HAS_SHM #include # ifndef HAS_SHMAT_PROTOTYPE - extern Shmat_t shmat _((int, char *, int)); + extern Shmat_t shmat (int, char *, int); # endif #endif #endif diff --git a/doop.c b/doop.c index ec14a76..0c9bb4f 100644 --- a/doop.c +++ b/doop.c @@ -19,16 +19,16 @@ #endif #ifndef PERL_OBJECT -static I32 do_trans_CC_simple _((SV *sv)); -static I32 do_trans_CC_count _((SV *sv)); -static I32 do_trans_CC_complex _((SV *sv)); -static I32 do_trans_UU_simple _((SV *sv)); -static I32 do_trans_UU_count _((SV *sv)); -static I32 do_trans_UU_complex _((SV *sv)); -static I32 do_trans_UC_simple _((SV *sv)); -static I32 do_trans_CU_simple _((SV *sv)); -static I32 do_trans_UC_trivial _((SV *sv)); -static I32 do_trans_CU_trivial _((SV *sv)); +static I32 do_trans_CC_simple (SV *sv); +static I32 do_trans_CC_count (SV *sv); +static I32 do_trans_CC_complex (SV *sv); +static I32 do_trans_UU_simple (SV *sv); +static I32 do_trans_UU_count (SV *sv); +static I32 do_trans_UU_complex (SV *sv); +static I32 do_trans_UC_simple (SV *sv); +static I32 do_trans_CU_simple (SV *sv); +static I32 do_trans_UC_trivial (SV *sv); +static I32 do_trans_CU_trivial (SV *sv); #endif STATIC I32 diff --git a/ext/B/B/C.pm b/ext/B/B/C.pm index 4aa80a1..a8f20a9 100644 --- a/ext/B/B/C.pm +++ b/ext/B/B/C.pm @@ -671,7 +671,7 @@ sub B::CV::save { my $stashname = $egv->STASH->NAME; $stashname =~ s/::/__/g; $xsub = sprintf("XS_%s_%s", $stashname, $egv->NAME); - $decl->add("void $xsub _((CV*));"); + $decl->add("void $xsub (CV*));"; } else { warn sprintf("No definition for sub %s::%s (unable to autoload)\n", @@ -1002,7 +1002,7 @@ typedef struct { HV * xcv_stash; OP * xcv_start; OP * xcv_root; - void (*xcv_xsub) _((CV*)); + void (*xcv_xsub) (CV*); void * xcv_xsubany; GV * xcv_gv; GV * xcv_filegv; @@ -1040,9 +1040,9 @@ sub output_boilerplate { #undef pp_mapstart #define pp_mapstart pp_grepstart #define XS_DynaLoader_boot_DynaLoader boot_DynaLoader -EXTERN_C void boot_DynaLoader _((CV* cv)); +EXTERN_C void boot_DynaLoader (CV* cv); -static void xs_init _((void)); +static void xs_init (void); static PerlInterpreter *my_perl; EOT } diff --git a/ext/B/B/CC.pm b/ext/B/B/CC.pm index 649f6e1..e21909e 100644 --- a/ext/B/B/CC.pm +++ b/ext/B/B/CC.pm @@ -149,7 +149,7 @@ sub init_pp { declare("SV", "**svp"); map { declare("SV", "*$_") } qw(sv src dst left right); declare("MAGIC", "*mg"); - $decl->add("static OP * $ppname _((ARGSproto));"); + $decl->add("static OP * $ppname (ARGSproto);"); debug "init_pp: $ppname\n" if $debug_queue; } diff --git a/ext/B/byteperl.c b/ext/B/byteperl.c index 313ca03..17dfdee 100644 --- a/ext/B/byteperl.c +++ b/ext/B/byteperl.c @@ -1,7 +1,7 @@ #include "EXTERN.h" #include "perl.h" -static void xs_init _((void)); +static void xs_init (void); static PerlInterpreter *my_perl; int @@ -81,8 +81,8 @@ main(int argc, char **argv, char **env) #ifdef INDIRECT_BGET_MACROS bs.data = fp; - bs.fgetc = (int(*) _((void*)))fgetc; - bs.fread = (int(*) _((char*,size_t,size_t,void*)))fread; + bs.fgetc = (int(*) (void*))fgetc; + bs.fread = (int(*) (char*,size_t,size_t,void*))fread; bs.freadpv = freadpv; byterun(bs); #else diff --git a/ext/ByteLoader/ByteLoader.xs b/ext/ByteLoader/ByteLoader.xs index ae2e18c..dd300be 100644 --- a/ext/ByteLoader/ByteLoader.xs +++ b/ext/ByteLoader/ByteLoader.xs @@ -25,8 +25,8 @@ byteloader_filter(int idx, SV *buf_sv, int maxlen) struct bytestream bs; bs.data = PL_rsfp; - bs.fgetc = (int(*) _((void*)))fgetc; - bs.fread = (int(*) _((char*,size_t,size_t,void*)))fread; + bs.fgetc = (int(*) (void*))fgetc; + bs.fread = (int(*) (char*,size_t,size_t,void*))fread; bs.freadpv = freadpv; byterun(bs); diff --git a/ext/Data/Dumper/Dumper.xs b/ext/Data/Dumper/Dumper.xs index c9ad9b6..c1faea2 100644 --- a/ext/Data/Dumper/Dumper.xs +++ b/ext/Data/Dumper/Dumper.xs @@ -19,14 +19,14 @@ # endif #endif -static I32 num_q _((char *s, STRLEN slen)); -static I32 esc_q _((char *dest, char *src, STRLEN slen)); -static SV *sv_x _((SV *sv, char *str, STRLEN len, I32 n)); -static I32 DD_dump _((SV *val, char *name, STRLEN namelen, SV *retval, - HV *seenhv, AV *postav, I32 *levelp, I32 indent, - SV *pad, SV *xpad, SV *apad, SV *sep, - SV *freezer, SV *toaster, - I32 purity, I32 deepcopy, I32 quotekeys, SV *bless)); +static I32 num_q (char *s, STRLEN slen); +static I32 esc_q (char *dest, char *src, STRLEN slen); +static SV *sv_x (SV *sv, char *str, STRLEN len, I32 n); +static I32 DD_dump (SV *val, char *name, STRLEN namelen, SV *retval, + HV *seenhv, AV *postav, I32 *levelp, I32 indent, + SV *pad, SV *xpad, SV *apad, SV *sep, + SV *freezer, SV *toaster, + I32 purity, I32 deepcopy, I32 quotekeys, SV *bless); /* does a string need to be protected? */ static I32 diff --git a/ext/DynaLoader/dl_beos.xs b/ext/DynaLoader/dl_beos.xs index 42a27cb..4e773df 100644 --- a/ext/DynaLoader/dl_beos.xs +++ b/ext/DynaLoader/dl_beos.xs @@ -102,7 +102,7 @@ dl_install_xsub(perl_name, symref, filename="$Package") CODE: DLDEBUG(2,PerlIO_printf(PerlIO_stderr(), "dl_install_xsub(name=%s, symref=%lx)\n", perl_name, (unsigned long) symref)); - ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)_((CV *)))symref, filename))); + ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)(CV *))symref, filename))); char * diff --git a/ext/DynaLoader/dl_dlopen.xs b/ext/DynaLoader/dl_dlopen.xs index 2459205..b2dbf3d 100644 --- a/ext/DynaLoader/dl_dlopen.xs +++ b/ext/DynaLoader/dl_dlopen.xs @@ -206,7 +206,7 @@ dl_install_xsub(perl_name, symref, filename="$Package") CODE: DLDEBUG(2,PerlIO_printf(PerlIO_stderr(), "dl_install_xsub(name=%s, symref=%lx)\n", perl_name, (unsigned long) symref)); - ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)_((CV *)))symref, filename))); + ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)(CV *))symref, filename))); char * diff --git a/ext/DynaLoader/dl_vmesa.xs b/ext/DynaLoader/dl_vmesa.xs index 34d4ddd..8c4fd1b 100644 --- a/ext/DynaLoader/dl_vmesa.xs +++ b/ext/DynaLoader/dl_vmesa.xs @@ -160,7 +160,7 @@ dl_install_xsub(perl_name, symref, filename="$Package") CODE: DLDEBUG(2,PerlIO_printf(PerlIO_stderr(), "dl_install_xsub(name=%s, symref=%lx)\n", perl_name, (unsigned long) symref)); - ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)_((CV *)))symref, filename))); + ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)(CV *))symref, filename))); char * diff --git a/ext/IO/poll.h b/ext/IO/poll.h index c5cdd7f..4055b49 100644 --- a/ext/IO/poll.h +++ b/ext/IO/poll.h @@ -41,7 +41,7 @@ typedef struct pollfd { #define POLLHUP 0x0010 #define POLLNVAL 0x0020 -int poll _((struct pollfd *, unsigned long, int)); +int poll (struct pollfd *, unsigned long, int); #ifndef HAS_POLL # define HAS_POLL diff --git a/ext/IPC/SysV/SysV.xs b/ext/IPC/SysV/SysV.xs index dbed151..38062e0 100644 --- a/ext/IPC/SysV/SysV.xs +++ b/ext/IPC/SysV/SysV.xs @@ -19,7 +19,7 @@ # endif # include # ifndef HAS_SHMAT_PROTOTYPE - extern Shmat_t shmat _((int, char *, int)); + extern Shmat_t shmat (int, char *, int); # endif # if defined(__sparc__) && (defined(__NetBSD__) || defined(__OpenBSD__)) # undef SHMLBA /* not static: determined at boot time */ diff --git a/ext/Opcode/Opcode.xs b/ext/Opcode/Opcode.xs index 648ee91..b07159c 100644 --- a/ext/Opcode/Opcode.xs +++ b/ext/Opcode/Opcode.xs @@ -11,11 +11,11 @@ static SV *opset_all; /* mask with all bits set */ static IV opset_len; /* length of opmasks in bytes */ static int opcode_debug = 0; -static SV *new_opset _((SV *old_opset)); -static int verify_opset _((SV *opset, int fatal)); -static void set_opset_bits _((char *bitmap, SV *bitspec, int on, char *opname)); -static void put_op_bitspec _((char *optag, STRLEN len, SV *opset)); -static SV *get_op_bitspec _((char *opname, STRLEN len, int fatal)); +static SV *new_opset (SV *old_opset); +static int verify_opset (SV *opset, int fatal); +static void set_opset_bits (char *bitmap, SV *bitspec, int on, char *opname); +static void put_op_bitspec (char *optag, STRLEN len, SV *opset); +static SV *get_op_bitspec (char *opname, STRLEN len, int fatal); /* Initialise our private op_named_bits HV. @@ -209,7 +209,7 @@ opmask_addlocal(SV *opset, char *op_mask_buf) /* Localise PL_op_mask then opmask * is disallowed by Borland */ if (opcode_debug >= 2) - SAVEDESTRUCTOR((void(CPERLscope(*))_((void*)))warn,"PL_op_mask restored"); + SAVEDESTRUCTOR((void(CPERLscope(*))(void*))warn,"PL_op_mask restored"); #endif PL_op_mask = &op_mask_buf[0]; if (orig_op_mask) diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index b228e1b..b529dbf 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -184,10 +184,10 @@ typedef struct termios* POSIX__Termios; #endif /* Possibly needed prototypes */ -char *cuserid _((char *)); -double strtod _((const char *, char **)); -long strtol _((const char *, char **, int)); -unsigned long strtoul _((const char *, char **, int)); +char *cuserid (char *); +double strtod (const char *, char **); +long strtol (const char *, char **, int); +unsigned long strtoul (const char *, char **, int); #ifndef HAS_CUSERID #define cuserid(a) (char *) not_here("cuserid") diff --git a/ext/Thread/Thread.xs b/ext/Thread/Thread.xs index c3b4683..8ae50d1 100644 --- a/ext/Thread/Thread.xs +++ b/ext/Thread/Thread.xs @@ -319,7 +319,7 @@ newthread (SV *startsv, AV *initargs, char *classname) #endif } -static Signal_t handle_thread_signal _((int sig)); +static Signal_t handle_thread_signal (int sig); static Signal_t handle_thread_signal(int sig) diff --git a/ext/re/re.xs b/ext/re/re.xs index 7230d62..baa990d 100644 --- a/ext/re/re.xs +++ b/ext/re/re.xs @@ -7,10 +7,10 @@ #include "perl.h" #include "XSUB.h" -extern regexp* my_regcomp _((char* exp, char* xend, PMOP* pm)); -extern I32 my_regexec _((regexp* prog, char* stringarg, char* strend, - char* strbeg, I32 minend, SV* screamer, - void* data, U32 flags)); +extern regexp* my_regcomp (char* exp, char* xend, PMOP* pm); +extern I32 my_regexec (regexp* prog, char* stringarg, char* strend, + char* strbeg, I32 minend, SV* screamer, + void* data, U32 flags); static int oldfl; diff --git a/handy.h b/handy.h index 9c73e55..851f348 100644 --- a/handy.h +++ b/handy.h @@ -324,7 +324,7 @@ typedef unsigned short U16; #define toLOWER_LC_utf8(p) toLOWER_LC_uni(utf8_to_uv(p, 0)) #ifdef EBCDIC -EXT int ebcdic_control _((int)); +EXT int ebcdic_control (int); # define toCTRL(c) ebcdic_control(c) #else /* This conversion works both ways, strangely enough. */ diff --git a/hv.c b/hv.c index 0c472bc..0f71f01 100644 --- a/hv.c +++ b/hv.c @@ -14,12 +14,12 @@ #include "EXTERN.h" #include "perl.h" -static void hv_magic_check _((HV *hv, bool *needs_copy, bool *needs_store)); +static void hv_magic_check (HV *hv, bool *needs_copy, bool *needs_store); #ifndef PERL_OBJECT -static void hsplit _((HV *hv)); -static void hfreeentries _((HV *hv)); -static void more_he _((void)); -static HEK *save_hek _((const char *str, I32 len, U32 hash)); +static void hsplit (HV *hv); +static void hfreeentries (HV *hv); +static void more_he (void); +static HEK *save_hek (const char *str, I32 len, U32 hash); #endif #if defined(STRANGE_MALLOC) || defined(MYMALLOC) diff --git a/iperlsys.h b/iperlsys.h index 1c376ef..9ad3256 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -71,7 +71,7 @@ # define PERLIO_IS_STDIO # endif #else -extern void PerlIO_init _((void)); +extern void PerlIO_init (void); #endif #ifdef PERL_OBJECT @@ -250,133 +250,133 @@ struct _PerlIO; #endif #ifndef PerlIO_stdoutf -extern int PerlIO_stdoutf _((const char *,...)) +extern int PerlIO_stdoutf (const char *,...) __attribute__((format (printf, 1, 2))); #endif #ifndef PerlIO_puts -extern int PerlIO_puts _((PerlIO *,const char *)); +extern int PerlIO_puts (PerlIO *,const char *); #endif #ifndef PerlIO_open -extern PerlIO * PerlIO_open _((const char *,const char *)); +extern PerlIO * PerlIO_open (const char *,const char *); #endif #ifndef PerlIO_close -extern int PerlIO_close _((PerlIO *)); +extern int PerlIO_close (PerlIO *); #endif #ifndef PerlIO_eof -extern int PerlIO_eof _((PerlIO *)); +extern int PerlIO_eof (PerlIO *); #endif #ifndef PerlIO_error -extern int PerlIO_error _((PerlIO *)); +extern int PerlIO_error (PerlIO *); #endif #ifndef PerlIO_clearerr -extern void PerlIO_clearerr _((PerlIO *)); +extern void PerlIO_clearerr (PerlIO *); #endif #ifndef PerlIO_getc -extern int PerlIO_getc _((PerlIO *)); +extern int PerlIO_getc (PerlIO *); #endif #ifndef PerlIO_putc -extern int PerlIO_putc _((PerlIO *,int)); +extern int PerlIO_putc (PerlIO *,int); #endif #ifndef PerlIO_flush -extern int PerlIO_flush _((PerlIO *)); +extern int PerlIO_flush (PerlIO *); #endif #ifndef PerlIO_ungetc -extern int PerlIO_ungetc _((PerlIO *,int)); +extern int PerlIO_ungetc (PerlIO *,int); #endif #ifndef PerlIO_fileno -extern int PerlIO_fileno _((PerlIO *)); +extern int PerlIO_fileno (PerlIO *); #endif #ifndef PerlIO_fdopen -extern PerlIO * PerlIO_fdopen _((int, const char *)); +extern PerlIO * PerlIO_fdopen (int, const char *); #endif #ifndef PerlIO_importFILE -extern PerlIO * PerlIO_importFILE _((FILE *,int)); +extern PerlIO * PerlIO_importFILE (FILE *,int); #endif #ifndef PerlIO_exportFILE -extern FILE * PerlIO_exportFILE _((PerlIO *,int)); +extern FILE * PerlIO_exportFILE (PerlIO *,int); #endif #ifndef PerlIO_findFILE -extern FILE * PerlIO_findFILE _((PerlIO *)); +extern FILE * PerlIO_findFILE (PerlIO *); #endif #ifndef PerlIO_releaseFILE -extern void PerlIO_releaseFILE _((PerlIO *,FILE *)); +extern void PerlIO_releaseFILE (PerlIO *,FILE *); #endif #ifndef PerlIO_read -extern SSize_t PerlIO_read _((PerlIO *,void *,Size_t)); +extern SSize_t PerlIO_read (PerlIO *,void *,Size_t); #endif #ifndef PerlIO_write -extern SSize_t PerlIO_write _((PerlIO *,const void *,Size_t)); +extern SSize_t PerlIO_write (PerlIO *,const void *,Size_t); #endif #ifndef PerlIO_setlinebuf -extern void PerlIO_setlinebuf _((PerlIO *)); +extern void PerlIO_setlinebuf (PerlIO *); #endif #ifndef PerlIO_printf -extern int PerlIO_printf _((PerlIO *, const char *,...)) +extern int PerlIO_printf (PerlIO *, const char *,...) __attribute__((format (printf, 2, 3))); #endif #ifndef PerlIO_sprintf -extern int PerlIO_sprintf _((char *, int, const char *,...)) +extern int PerlIO_sprintf (char *, int, const char *,...) __attribute__((format (printf, 3, 4))); #endif #ifndef PerlIO_vprintf -extern int PerlIO_vprintf _((PerlIO *, const char *, va_list)); +extern int PerlIO_vprintf (PerlIO *, const char *, va_list); #endif #ifndef PerlIO_tell -extern Off_t PerlIO_tell _((PerlIO *)); +extern Off_t PerlIO_tell (PerlIO *); #endif #ifndef PerlIO_seek -extern int PerlIO_seek _((PerlIO *, Off_t, int)); +extern int PerlIO_seek (PerlIO *, Off_t, int); #endif #ifndef PerlIO_rewind -extern void PerlIO_rewind _((PerlIO *)); +extern void PerlIO_rewind (PerlIO *); #endif #ifndef PerlIO_has_base -extern int PerlIO_has_base _((PerlIO *)); +extern int PerlIO_has_base (PerlIO *); #endif #ifndef PerlIO_has_cntptr -extern int PerlIO_has_cntptr _((PerlIO *)); +extern int PerlIO_has_cntptr (PerlIO *); #endif #ifndef PerlIO_fast_gets -extern int PerlIO_fast_gets _((PerlIO *)); +extern int PerlIO_fast_gets (PerlIO *); #endif #ifndef PerlIO_canset_cnt -extern int PerlIO_canset_cnt _((PerlIO *)); +extern int PerlIO_canset_cnt (PerlIO *); #endif #ifndef PerlIO_get_ptr -extern STDCHAR * PerlIO_get_ptr _((PerlIO *)); +extern STDCHAR * PerlIO_get_ptr (PerlIO *); #endif #ifndef PerlIO_get_cnt -extern int PerlIO_get_cnt _((PerlIO *)); +extern int PerlIO_get_cnt (PerlIO *); #endif #ifndef PerlIO_set_cnt -extern void PerlIO_set_cnt _((PerlIO *,int)); +extern void PerlIO_set_cnt (PerlIO *,int); #endif #ifndef PerlIO_set_ptrcnt -extern void PerlIO_set_ptrcnt _((PerlIO *,STDCHAR *,int)); +extern void PerlIO_set_ptrcnt (PerlIO *,STDCHAR *,int); #endif #ifndef PerlIO_get_base -extern STDCHAR * PerlIO_get_base _((PerlIO *)); +extern STDCHAR * PerlIO_get_base (PerlIO *); #endif #ifndef PerlIO_get_bufsiz -extern int PerlIO_get_bufsiz _((PerlIO *)); +extern int PerlIO_get_bufsiz (PerlIO *); #endif #ifndef PerlIO_tmpfile -extern PerlIO * PerlIO_tmpfile _((void)); +extern PerlIO * PerlIO_tmpfile (void); #endif #ifndef PerlIO_stdin -extern PerlIO * PerlIO_stdin _((void)); +extern PerlIO * PerlIO_stdin (void); #endif #ifndef PerlIO_stdout -extern PerlIO * PerlIO_stdout _((void)); +extern PerlIO * PerlIO_stdout (void); #endif #ifndef PerlIO_stderr -extern PerlIO * PerlIO_stderr _((void)); +extern PerlIO * PerlIO_stderr (void); #endif #ifndef PerlIO_getpos -extern int PerlIO_getpos _((PerlIO *,Fpos_t *)); +extern int PerlIO_getpos (PerlIO *,Fpos_t *); #endif #ifndef PerlIO_setpos -extern int PerlIO_setpos _((PerlIO *,const Fpos_t *)); +extern int PerlIO_setpos (PerlIO *,const Fpos_t *); #endif @@ -652,7 +652,7 @@ public: #ifdef PERL_OBJECT #ifndef Sighandler_t -typedef Signal_t (*Sighandler_t) _((int)); +typedef Signal_t (*Sighandler_t) (int); #endif #ifndef jmp_buf #include diff --git a/jpl/PerlInterpreter/PerlInterpreter.c b/jpl/PerlInterpreter/PerlInterpreter.c index 8bf3f5f..ad85ca2 100644 --- a/jpl/PerlInterpreter/PerlInterpreter.c +++ b/jpl/PerlInterpreter/PerlInterpreter.c @@ -16,7 +16,7 @@ # endif #endif -static void xs_init _((void)); +static void xs_init (void); static PerlInterpreter *my_perl; int jpldebug = 0; @@ -117,8 +117,8 @@ Java_PerlInterpreter_eval(JNIEnv *env, jobject obj, jint ji) /* Register any extra external extensions */ /* Do not delete this line--writemain depends on it */ -EXTERN_C void boot_DynaLoader _((CV* cv)); -EXTERN_C void boot_JNI _((CV* cv)); +EXTERN_C void boot_DynaLoader (CV* cv); +EXTERN_C void boot_JNI (CV* cv); static void xs_init() diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm index 4b56e88..7b240cc 100644 --- a/lib/ExtUtils/Embed.pm +++ b/lib/ExtUtils/Embed.pm @@ -75,7 +75,7 @@ sub xsinit { @mods = grep(!$seen{$_}++, @mods); print $fh &xsi_header(); - print $fh "EXTERN_C void xs_init _(($xsinit_proto));\n\n"; + print $fh "EXTERN_C void xs_init ($xsinit_proto);\n\n"; print $fh &xsi_protos(@mods); print $fh "\nEXTERN_C void\nxs_init($xsinit_proto)\n{\n"; @@ -127,7 +127,7 @@ sub xsi_protos { my($mname, $cname); ($mname = $pname) =~ s!/!::!g; ($cname = $pname) =~ s!/!__!g; - my($ccode) = "EXTERN_C void boot_${cname} _(($boot_proto));\n"; + my($ccode) = "EXTERN_C void boot_${cname} ($boot_proto);\n"; next if $seen{$ccode}++; push(@retval, $ccode); } diff --git a/malloc.c b/malloc.c index d62267f..5a51413 100644 --- a/malloc.c +++ b/malloc.c @@ -412,10 +412,10 @@ union overhead { }; #ifdef DEBUGGING -static void botch _((char *diag, char *s)); +static void botch (char *diag, char *s); #endif -static void morecore _((int bucket)); -static int findbucket _((union overhead *freep, int srchlen)); +static void morecore (int bucket); +static int findbucket (union overhead *freep, int srchlen); static void add_to_chain(void *p, MEM_SIZE size, MEM_SIZE chip); #define MAGIC 0xff /* magic # on accounting info */ @@ -790,7 +790,7 @@ static union overhead *nextf[NBUCKETS]; #ifdef USE_PERL_SBRK #define sbrk(a) Perl_sbrk(a) -Malloc_t Perl_sbrk _((int size)); +Malloc_t Perl_sbrk (int size); #else #ifdef DONT_DECLARE_STD #ifdef I_UNISTD diff --git a/mg.c b/mg.c index 0f9710c..bfd6035 100644 --- a/mg.c +++ b/mg.c @@ -30,7 +30,7 @@ # define VTBL this->*vtbl #else # define VTBL *vtbl -static void restore_magic _((void *p)); +static void restore_magic (void *p); static int magic_methcall(SV *sv, MAGIC *mg, char *meth, I32 f, int n, SV *val); #endif diff --git a/mg.h b/mg.h index ccd3acc..ebd47c3 100644 --- a/mg.h +++ b/mg.h @@ -11,11 +11,11 @@ STRUCT_MGVTBL_DEFINITION; #else struct mgvtbl { - int (CPERLscope(*svt_get)) _((SV *sv, MAGIC* mg)); - int (CPERLscope(*svt_set)) _((SV *sv, MAGIC* mg)); - U32 (CPERLscope(*svt_len)) _((SV *sv, MAGIC* mg)); - int (CPERLscope(*svt_clear)) _((SV *sv, MAGIC* mg)); - int (CPERLscope(*svt_free)) _((SV *sv, MAGIC* mg)); + int (CPERLscope(*svt_get)) (SV *sv, MAGIC* mg); + int (CPERLscope(*svt_set)) (SV *sv, MAGIC* mg); + U32 (CPERLscope(*svt_len)) (SV *sv, MAGIC* mg); + int (CPERLscope(*svt_clear)) (SV *sv, MAGIC* mg); + int (CPERLscope(*svt_free)) (SV *sv, MAGIC* mg); }; #endif diff --git a/minimod.pl b/minimod.pl index 82760ee..8efbd31 100644 --- a/minimod.pl +++ b/minimod.pl @@ -59,7 +59,7 @@ sub writemain{ my($mname, $cname); ($mname = $pname) =~ s!/!::!g; ($cname = $pname) =~ s!/!__!g; - print "EXTERN_C void boot_${cname} _((CV* cv));\n"; + print "EXTERN_C void boot_${cname} (CV* cv);\n"; } my ($tail1,$tail2) = ( $tail =~ /\A(.*\n)(\s*\}.*)\Z/s ); diff --git a/miniperlmain.c b/miniperlmain.c index cfbe95b..4a0fe67 100644 --- a/miniperlmain.c +++ b/miniperlmain.c @@ -10,7 +10,7 @@ #include "EXTERN.h" #include "perl.h" -static void xs_init _((void)); +static void xs_init (void); static PerlInterpreter *my_perl; #if defined (__MINT__) || defined (atarist) diff --git a/op.c b/op.c index 2bfd904..4993c2c 100644 --- a/op.c +++ b/op.c @@ -60,23 +60,23 @@ Slab_Alloc(int m, size_t sz) #define PAD_MAX 999999999 -static bool scalar_mod_type _((OP *o, I32 type)); +static bool scalar_mod_type (OP *o, I32 type); #ifndef PERL_OBJECT -static I32 list_assignment _((OP *o)); -static void bad_type _((I32 n, char *t, char *name, OP *kid)); -static OP *modkids _((OP *o, I32 type)); -static OP *no_fh_allowed _((OP *o)); -static void no_bareword_allowed _((OP *o)); -static OP *scalarboolean _((OP *o)); -static OP *too_few_arguments _((OP *o, char* name)); -static OP *too_many_arguments _((OP *o, char* name)); -static void null _((OP* o)); -static PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, - CV* startcv, I32 cx_ix, I32 saweval, U32 flags)); -static OP *newDEFSVOP _((void)); -static OP *new_logop _((I32 type, I32 flags, OP **firstp, OP **otherp)); -static void simplify_sort _((OP *o)); -static bool is_handle_constructor _((OP *o, I32 argnum)); +static I32 list_assignment (OP *o); +static void bad_type (I32 n, char *t, char *name, OP *kid); +static OP *modkids (OP *o, I32 type); +static OP *no_fh_allowed (OP *o); +static void no_bareword_allowed (OP *o); +static OP *scalarboolean (OP *o); +static OP *too_few_arguments (OP *o, char* name); +static OP *too_many_arguments (OP *o, char* name); +static void null (OP* o); +static PADOFFSET pad_findlex (char* name, PADOFFSET newoff, U32 seq, + CV* startcv, I32 cx_ix, I32 saweval, U32 flags); +static OP *newDEFSVOP (void); +static OP *new_logop (I32 type, I32 flags, OP **firstp, OP **otherp); +static void simplify_sort (OP *o); +static bool is_handle_constructor (OP *o, I32 argnum); #endif STATIC char* @@ -5010,6 +5010,7 @@ ck_lfun(OP *o) OP * ck_defined(OP *o) /* 19990527 MJD */ { + dTHR; if (ckWARN(WARN_DEPRECATED)) { switch (cUNOPo->op_first->op_type) { case OP_RV2AV: diff --git a/op.h b/op.h index bb5bf87..21404bc 100644 --- a/op.h +++ b/op.h @@ -38,7 +38,7 @@ typedef U32 PADOFFSET; #define BASEOP \ OP* op_next; \ OP* op_sibling; \ - OP* (CPERLscope(*op_ppaddr))_((ARGSproto)); \ + OP* (CPERLscope(*op_ppaddr))(ARGSproto); \ PADOFFSET op_targ; \ OPCODE op_type; \ U16 op_seq; \ diff --git a/opcode.h b/opcode.h index b6143ea..1dbd3de 100644 --- a/opcode.h +++ b/opcode.h @@ -1072,8 +1072,8 @@ START_EXTERN_C #undef PERL_CKDEF #undef PERL_PPDEF -#define PERL_CKDEF(s) OP *s _((OP *o)); -#define PERL_PPDEF(s) OP *s _((ARGSproto)); +#define PERL_CKDEF(s) OP *s (OP *o); +#define PERL_PPDEF(s) OP *s (ARGSproto); #include "pp_proto.h" @@ -1437,9 +1437,9 @@ EXT OP * (CPERLscope(*PL_ppaddr)[])(ARGSproto) = { #endif #ifndef DOINIT -EXT OP * (CPERLscope(*PL_check)[]) _((OP *op)); +EXT OP * (CPERLscope(*PL_check)[]) (OP *op); #else -EXT OP * (CPERLscope(*PL_check)[]) _((OP *op)) = { +EXT OP * (CPERLscope(*PL_check)[]) (OP *op) = { ck_null, /* null */ ck_null, /* stub */ ck_fun, /* scalar */ diff --git a/opcode.pl b/opcode.pl index c763675..2733cbe 100755 --- a/opcode.pl +++ b/opcode.pl @@ -82,8 +82,8 @@ START_EXTERN_C #undef PERL_CKDEF #undef PERL_PPDEF -#define PERL_CKDEF(s) OP *s _((OP *o)); -#define PERL_PPDEF(s) OP *s _((ARGSproto)); +#define PERL_CKDEF(s) OP *s (OP *o); +#define PERL_PPDEF(s) OP *s (ARGSproto); #include "pp_proto.h" @@ -92,13 +92,13 @@ END # Emit function declarations. #for (sort keys %ckname) { -# print "OP *\t", &tab(3,$_),"_((OP* o));\n"; +# print "OP *\t", &tab(3,$_),"(OP* o);\n"; #} # #print "\n"; # #for (@ops) { -# print "OP *\t", &tab(3, "pp_$_"), "_((ARGSproto));\n"; +# print "OP *\t", &tab(3, "pp_$_"), "(ARGSproto);\n"; #} # Emit ppcode switch array. @@ -128,9 +128,9 @@ END print <pp.sym' or die "Error creating pp.sym: $!"; for (sort keys %ckname) { print PP "PERL_CKDEF($_)\n"; -#OP *\t", &tab(3,$_),"_((OP* o));\n"; +#OP *\t", &tab(3,$_),"(OP* o);\n"; } print PP "\n\n"; diff --git a/os2/POSIX.mkfifo b/os2/POSIX.mkfifo index 5bd820e..f460bc6 100644 --- a/os2/POSIX.mkfifo +++ b/os2/POSIX.mkfifo @@ -5,7 +5,7 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/ext/POSIX/POSIX.xs ./ext/POSIX/POSIX. *** 81,86 **** --- 81,90 ---- /* Possibly needed prototypes */ - char *cuserid _((char *)); + char *cuserid (char *); + #ifndef HAS_MKFIFO + #define mkfifo(a,b) not_here("mkfifo") diff --git a/perl.c b/perl.c index 8fe6915..7fad9f0 100644 --- a/perl.c +++ b/perl.c @@ -20,7 +20,7 @@ #endif #if !defined(STANDARD_C) && !defined(HAS_GETENV_PROTOTYPE) -char *getenv _((char *)); /* Usually in */ +char *getenv (char *); /* Usually in */ #endif #ifdef I_FCNTL @@ -43,36 +43,36 @@ char *getenv _((char *)); /* Usually in */ #endif #ifdef PERL_OBJECT -static I32 read_e_script _((CPerlObj* pPerl, int idx, SV *buf_sv, int maxlen)); +static I32 read_e_script (CPerlObj* pPerl, int idx, SV *buf_sv, int maxlen); #else -static void find_beginning _((void)); -static void forbid_setid _((char *)); -static void incpush _((char *, int)); -static void init_interp _((void)); -static void init_ids _((void)); -static void init_debugger _((void)); -static void init_lexer _((void)); -static void init_main_stash _((void)); -static void *perl_parse_body _((va_list args)); -static void *perl_run_body _((va_list args)); -static void *perl_call_body _((va_list args)); -static void perl_call_xbody _((OP *myop, int is_eval)); -static void *call_list_body _((va_list args)); +static void find_beginning (void); +static void forbid_setid (char *); +static void incpush (char *, int); +static void init_interp (void); +static void init_ids (void); +static void init_debugger (void); +static void init_lexer (void); +static void init_main_stash (void); +static void *perl_parse_body (va_list args); +static void *perl_run_body (va_list args); +static void *perl_call_body (va_list args); +static void perl_call_xbody (OP *myop, int is_eval); +static void *call_list_body (va_list args); #ifdef USE_THREADS -static struct perl_thread * init_main_thread _((void)); +static struct perl_thread * init_main_thread (void); #endif /* USE_THREADS */ -static void init_perllib _((void)); -static void init_postdump_symbols _((int, char **, char **)); -static void init_predump_symbols _((void)); -static void my_exit_jump _((void)) __attribute__((noreturn)); -static void nuke_stacks _((void)); -static void open_script _((char *, bool, SV *, int *fd)); -static void usage _((char *)); +static void init_perllib (void); +static void init_postdump_symbols (int, char **, char **); +static void init_predump_symbols (void); +static void my_exit_jump (void) __attribute__((noreturn)); +static void nuke_stacks (void); +static void open_script (char *, bool, SV *, int *fd); +static void usage (char *); #ifdef IAMSUID -static int fd_on_nosuid_fs _((int)); +static int fd_on_nosuid_fs (int); #endif -static void validate_suid _((char *, char*, int)); -static I32 read_e_script _((int idx, SV *buf_sv, int maxlen)); +static void validate_suid (char *, char*, int); +static I32 read_e_script (int idx, SV *buf_sv, int maxlen); #endif #ifdef PERL_OBJECT diff --git a/perl.h b/perl.h index 97e130d..4ecfcde 100644 --- a/perl.h +++ b/perl.h @@ -393,12 +393,12 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); # else # define EMBEDMYMALLOC /* for compatibility */ # endif -Malloc_t Perl_malloc _((MEM_SIZE nbytes)); -Malloc_t Perl_calloc _((MEM_SIZE elements, MEM_SIZE size)); -Malloc_t Perl_realloc _((Malloc_t where, MEM_SIZE nbytes)); +Malloc_t Perl_malloc (MEM_SIZE nbytes); +Malloc_t Perl_calloc (MEM_SIZE elements, MEM_SIZE size); +Malloc_t Perl_realloc (Malloc_t where, MEM_SIZE nbytes); /* 'mfree' rather than 'free', since there is already a 'perl_free' * that causes clashes with case-insensitive linkers */ -Free_t Perl_mfree _((Malloc_t where)); +Free_t Perl_mfree (Malloc_t where); # define safemalloc Perl_malloc # define safecalloc Perl_calloc @@ -436,7 +436,7 @@ Free_t Perl_mfree _((Malloc_t where)); #ifdef HAS_MEMCPY # if !defined(STANDARD_C) && !defined(I_STRING) && !defined(I_MEMORY) # ifndef memcpy - extern char * memcpy _((char*, char*, int)); + extern char * memcpy (char*, char*, int); # endif # endif #else @@ -452,7 +452,7 @@ Free_t Perl_mfree _((Malloc_t where)); #ifdef HAS_MEMSET # if !defined(STANDARD_C) && !defined(I_STRING) && !defined(I_MEMORY) # ifndef memset - extern char *memset _((char*, int, int)); + extern char *memset (char*, int, int); # endif # endif #else @@ -478,7 +478,7 @@ Free_t Perl_mfree _((Malloc_t where)); #if defined(HAS_MEMCMP) && defined(HAS_SANE_MEMCMP) # if !defined(STANDARD_C) && !defined(I_STRING) && !defined(I_MEMORY) # ifndef memcmp - extern int memcmp _((char*, char*, int)); + extern int memcmp (char*, char*, int); # endif # endif # ifdef BUGGY_MSC @@ -611,10 +611,10 @@ Free_t Perl_mfree _((Malloc_t where)); #ifdef HAS_STRERROR # ifdef VMS - char *strerror _((int,...)); + char *strerror (int,...); # else #ifndef DONT_DECLARE_STD - char *strerror _((int)); + char *strerror (int); #endif # endif # ifndef Strerror @@ -1300,9 +1300,9 @@ typedef union any ANY; #endif #ifdef PERL_OBJECT -typedef I32 (*filter_t) _((CPerlObj*, int, SV *, int)); +typedef I32 (*filter_t) (CPerlObj*, int, SV *, int); #else -typedef I32 (*filter_t) _((int, SV *, int)); +typedef I32 (*filter_t) (int, SV *, int); #endif #define FILTER_READ(idx, sv, len) filter_read(idx, sv, len) @@ -1500,7 +1500,7 @@ union any { I32 any_i32; IV any_iv; long any_long; - void (CPERLscope(*any_dptr)) _((void*)); + void (CPERLscope(*any_dptr)) (void*); }; #endif @@ -1685,10 +1685,10 @@ struct Outrec { #endif #ifndef __cplusplus -Uid_t getuid _((void)); -Uid_t geteuid _((void)); -Gid_t getgid _((void)); -Gid_t getegid _((void)); +Uid_t getuid (void); +Uid_t geteuid (void); +Gid_t getgid (void); +Gid_t getegid (void); #endif #ifndef Perl_debug_log @@ -1758,15 +1758,15 @@ Gid_t getegid _((void)); #endif struct ufuncs { - I32 (*uf_val)_((IV, SV*)); - I32 (*uf_set)_((IV, SV*)); + I32 (*uf_val)(IV, SV*); + I32 (*uf_set)(IV, SV*); IV uf_index; }; /* Fix these up for __STDC__ */ #ifndef DONT_DECLARE_STD -char *mktemp _((char*)); -double atof _((const char*)); +char *mktemp (char*); +double atof (const char*); #endif #ifndef STANDARD_C @@ -1787,17 +1787,17 @@ char *strcpy(), *strcat(); # include #else START_EXTERN_C - double exp _((double)); - double log _((double)); - double log10 _((double)); - double sqrt _((double)); - double frexp _((double,int*)); - double ldexp _((double,int)); - double modf _((double,double*)); - double sin _((double)); - double cos _((double)); - double atan2 _((double,double)); - double pow _((double,double)); + double exp (double); + double log (double); + double log10 (double); + double sqrt (double); + double frexp (double,int*); + double ldexp (double,int); + double modf (double,double*); + double sin (double); + double cos (double); + double atan2 (double,double); + double pow (double,double); END_EXTERN_C #endif @@ -1806,21 +1806,21 @@ END_EXTERN_C char *crypt (); /* Maybe more hosts will need the unprototyped version */ # else # if !defined(WIN32) || !defined(HAVE_DES_FCRYPT) -char *crypt _((const char*, const char*)); +char *crypt (const char*, const char*); # endif /* !WIN32 && !HAVE_CRYPT_SOURCE */ # endif /* !NeXT && !__NeXT__ */ # ifndef DONT_DECLARE_STD # ifndef getenv -char *getenv _((const char*)); +char *getenv (const char*); # endif /* !getenv */ -Off_t lseek _((int,Off_t,int)); +Off_t lseek (int,Off_t,int); # endif /* !DONT_DECLARE_STD */ -char *getlogin _((void)); +char *getlogin (void); #endif /* !__cplusplus */ #ifdef UNLINK_ALL_VERSIONS /* Currently only makes sense for VMS */ #define UNLINK unlnk -I32 unlnk _((char*)); +I32 unlnk (char*); #else #define UNLINK PerlLIO_unlink #endif @@ -1838,7 +1838,7 @@ I32 unlnk _((char*)); # endif #endif -typedef Signal_t (*Sighandler_t) _((int)); +typedef Signal_t (*Sighandler_t) (int); #ifdef HAS_SIGACTION typedef struct sigaction Sigsave_t; @@ -1890,10 +1890,10 @@ typedef Sighandler_t Sigsave_t; */ #ifndef PERL_OBJECT -typedef int (*runops_proc_t) _((void)); -int runops_standard _((void)); +typedef int (*runops_proc_t) (void); +int runops_standard (void); #ifdef DEBUGGING -int runops_debug _((void)); +int runops_debug (void); #endif #endif @@ -2270,16 +2270,16 @@ enum { /* pass one of these to get_vtbl */ /* Enable variables which are pointers to functions */ #ifdef PERL_OBJECT -typedef regexp*(CPerlObj::*regcomp_t) _((char* exp, char* xend, PMOP* pm)); -typedef I32 (CPerlObj::*regexec_t) _((regexp* prog, char* stringarg, - char* strend, char* strbeg, - I32 minend, SV* screamer, void* data, - U32 flags)); +typedef regexp*(CPerlObj::*regcomp_t) (char* exp, char* xend, PMOP* pm); +typedef I32 (CPerlObj::*regexec_t) (regexp* prog, char* stringarg, + char* strend, char* strbeg, + I32 minend, SV* screamer, void* data, + U32 flags); #else -typedef regexp*(*regcomp_t) _((char* exp, char* xend, PMOP* pm)); -typedef I32 (*regexec_t) _((regexp* prog, char* stringarg, char* strend, char* - strbeg, I32 minend, SV* screamer, void* data, - U32 flags)); +typedef regexp*(*regcomp_t) (char* exp, char* xend, PMOP* pm); +typedef I32 (*regexec_t) (regexp* prog, char* stringarg, char* strend, char* + strbeg, I32 minend, SV* screamer, void* data, + U32 flags); #endif @@ -2291,18 +2291,18 @@ typedef I32 (*regexec_t) _((regexp* prog, char* stringarg, char* strend, char* /* Interpreter exitlist entry */ typedef struct exitlistentry { #ifdef PERL_OBJECT - void (*fn) _((CPerlObj*, void*)); + void (*fn) (CPerlObj*, void*); #else - void (*fn) _((void*)); + void (*fn) (void*); #endif void *ptr; } PerlExitListEntry; #ifdef PERL_OBJECT -extern "C" CPerlObj* perl_alloc _((IPerlMem*, IPerlEnv*, IPerlStdIO*, IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*)); +extern "C" CPerlObj* perl_alloc (IPerlMem*, IPerlEnv*, IPerlStdIO*, IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*); #ifdef PERL_OBJECT -typedef int (CPerlObj::*runops_proc_t) _((void)); +typedef int (CPerlObj::*runops_proc_t) (void); #endif /* PERL_OBJECT */ #undef EXT diff --git a/plan9/config.plan9 b/plan9/config.plan9 index b35f60a..24b3075 100644 --- a/plan9/config.plan9 +++ b/plan9/config.plan9 @@ -716,7 +716,7 @@ /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ diff --git a/pod/perlembed.pod b/pod/perlembed.pod index 03c5507..db5aab0 100644 --- a/pod/perlembed.pod +++ b/pod/perlembed.pod @@ -901,10 +901,10 @@ to see how Perl does this: # define EXTERN_C extern #endif - static void xs_init _((void)); + static void xs_init (void); - EXTERN_C void boot_DynaLoader _((CV* cv)); - EXTERN_C void boot_Socket _((CV* cv)); + EXTERN_C void boot_DynaLoader (CV* cv); + EXTERN_C void boot_Socket (CV* cv); EXTERN_C void diff --git a/pod/perlguts.pod b/pod/perlguts.pod index ad4c702..2c6d3a2 100644 --- a/pod/perlguts.pod +++ b/pod/perlguts.pod @@ -2775,7 +2775,7 @@ Returns a boolean indicating whether the SV is derived from the specified class. This is the function that implements C. It works for class names as well as for objects. - bool sv_derived_from _((SV* sv, const char* name)); + bool sv_derived_from (SV* sv, const char* name); =item SvEND @@ -3402,18 +3402,18 @@ Processes its arguments like C and appends the formatted output to an SV. Uses an array of SVs if the C style variable argument list is missing (NULL). Indicates if locale information has been used for formatting. - void sv_catpvfn _((SV* sv, const char* pat, STRLEN patlen, - va_list *args, SV **svargs, I32 svmax, - bool *used_locale)); + void sv_catpvfn (SV* sv, const char* pat, STRLEN patlen, + va_list *args, SV **svargs, I32 svmax, + bool *used_locale); =item sv_vsetpvfn(sv, pat, patlen, args, svargs, svmax, used_locale) Works like C but copies the text into the SV instead of appending it. - void sv_setpvfn _((SV* sv, const char* pat, STRLEN patlen, - va_list *args, SV **svargs, I32 svmax, - bool *used_locale)); + void sv_setpvfn (SV* sv, const char* pat, STRLEN patlen, + va_list *args, SV **svargs, I32 svmax, + bool *used_locale); =item SvUV diff --git a/pp.c b/pp.c index 1b9ebdd..7a3e3cb 100644 --- a/pp.c +++ b/pp.c @@ -111,9 +111,9 @@ typedef unsigned UBW; #endif #ifndef PERL_OBJECT -static void doencodes _((SV* sv, char* s, I32 len)); -static SV* refto _((SV* sv)); -static U32 seed _((void)); +static void doencodes (SV* sv, char* s, I32 len); +static SV* refto (SV* sv); +static U32 seed (void); #endif /* variations on pp_null */ @@ -1670,7 +1670,7 @@ PP(pp_cos) */ #ifndef HAS_DRAND48_PROTO -extern double drand48 _((void)); +extern double drand48 (void); #endif PP(pp_rand) diff --git a/pp_ctl.c b/pp_ctl.c index 44c2b52..d44a490 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -29,27 +29,27 @@ #define CALLOP this->*PL_op #else #define CALLOP *PL_op -static void *docatch_body _((va_list args)); -static OP *docatch _((OP *o)); -static OP *dofindlabel _((OP *o, char *label, OP **opstack, OP **oplimit)); -static void doparseform _((SV *sv)); -static I32 dopoptoeval _((I32 startingblock)); -static I32 dopoptolabel _((char *label)); -static I32 dopoptoloop _((I32 startingblock)); -static I32 dopoptosub _((I32 startingblock)); -static I32 dopoptosub_at _((PERL_CONTEXT *cxstk, I32 startingblock)); -static void save_lines _((AV *array, SV *sv)); -static I32 sortcv _((SV *a, SV *b)); -static void qsortsv _((SV **array, size_t num_elts, I32 (*fun)(SV *a, SV *b))); -static OP *doeval _((int gimme, OP** startop)); -static PerlIO *doopen_pmc _((const char *name, const char *mode)); -static I32 sv_ncmp _((SV *a, SV *b)); -static I32 sv_i_ncmp _((SV *a, SV *b)); -static I32 amagic_ncmp _((SV *a, SV *b)); -static I32 amagic_i_ncmp _((SV *a, SV *b)); -static I32 amagic_cmp _((SV *str1, SV *str2)); -static I32 amagic_cmp_locale _((SV *str1, SV *str2)); -static void free_closures _((void)); +static void *docatch_body (va_list args); +static OP *docatch (OP *o); +static OP *dofindlabel (OP *o, char *label, OP **opstack, OP **oplimit); +static void doparseform (SV *sv); +static I32 dopoptoeval (I32 startingblock); +static I32 dopoptolabel (char *label); +static I32 dopoptoloop (I32 startingblock); +static I32 dopoptosub (I32 startingblock); +static I32 dopoptosub_at (PERL_CONTEXT *cxstk, I32 startingblock); +static void save_lines (AV *array, SV *sv); +static I32 sortcv (SV *a, SV *b); +static void qsortsv (SV **array, size_t num_elts, I32 (*fun)(SV *a, SV *b)); +static OP *doeval (int gimme, OP** startop); +static PerlIO *doopen_pmc (const char *name, const char *mode); +static I32 sv_ncmp (SV *a, SV *b); +static I32 sv_i_ncmp (SV *a, SV *b); +static I32 amagic_ncmp (SV *a, SV *b); +static I32 amagic_i_ncmp (SV *a, SV *b); +static I32 amagic_cmp (SV *str1, SV *str2); +static I32 amagic_cmp_locale (SV *str1, SV *str2); +static void free_closures (void); #endif PP(pp_wantarray) @@ -2178,12 +2178,12 @@ PP(pp_goto) if (CvXSUB(cv)) { #ifdef PERL_XSUB_OLDSTYLE if (CvOLDSTYLE(cv)) { - I32 (*fp3)_((int,int,int)); + I32 (*fp3)(int,int,int); while (SP > mark) { SP[1] = SP[0]; SP--; } - fp3 = (I32(*)_((int,int,int)))CvXSUB(cv); + fp3 = (I32(*)(int,int,int)))CvXSUB(cv; items = (*fp3)(CvXSUBANY(cv).any_i32, mark - PL_stack_base + 1, items); diff --git a/pp_hot.c b/pp_hot.c index 599a2af..e6de9bd 100644 --- a/pp_hot.c +++ b/pp_hot.c @@ -2315,7 +2315,7 @@ try_autoload: if (CvXSUB(cv)) { #ifdef PERL_XSUB_OLDSTYLE if (CvOLDSTYLE(cv)) { - I32 (*fp3)_((int,int,int)); + I32 (*fp3)(int,int,int); dMARK; register I32 items = SP - MARK; /* We dont worry to copy from @_. */ @@ -2324,7 +2324,7 @@ try_autoload: SP--; } PL_stack_sp = mark + 1; - fp3 = (I32(*)_((int,int,int)))CvXSUB(cv); + fp3 = (I32(*)(int,int,int)))CvXSUB(cv; items = (*fp3)(CvXSUBANY(cv).any_i32, MARK - PL_stack_base + 1, items); diff --git a/pp_sys.c b/pp_sys.c index bc5ccc0..dd588ec 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -76,11 +76,11 @@ extern int h_errno; # ifdef I_PWD # include # else - struct passwd *getpwnam _((char *)); - struct passwd *getpwuid _((Uid_t)); + struct passwd *getpwnam (char *); + struct passwd *getpwuid (Uid_t); # endif # ifdef HAS_GETPWENT - struct passwd *getpwent _((void)); + struct passwd *getpwent (void); # endif #endif @@ -88,11 +88,11 @@ extern int h_errno; # ifdef I_GRP # include # else - struct group *getgrnam _((char *)); - struct group *getgrgid _((Gid_t)); + struct group *getgrnam (char *); + struct group *getgrgid (Gid_t); # endif # ifdef HAS_GETGRENT - struct group *getgrent _((void)); + struct group *getgrent (void); # endif #endif @@ -125,7 +125,7 @@ extern int h_errno; #endif #if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) -static int dooneliner _((char *cmd, char *filename)); +static int dooneliner (char *cmd, char *filename); #endif #ifdef HAS_CHSIZE @@ -158,7 +158,7 @@ static int dooneliner _((char *cmd, char *filename)); # endif /* no flock() or fcntl(F_SETLK,...) */ # ifdef FLOCK - static int FLOCK _((int, int)); + static int FLOCK (int, int); /* * These are the flock() constants. Since this sytems doesn't have @@ -3335,7 +3335,7 @@ PP(pp_readdir) djSP; #if defined(Direntry_t) && defined(HAS_READDIR) #ifndef I_DIRENT - Direntry_t *readdir _((DIR *)); + Direntry_t *readdir (DIR *); #endif register Direntry_t *dp; GV *gv = (GV*)POPs; @@ -3395,7 +3395,7 @@ PP(pp_telldir) XXX HAS_TELLDIR_PROTO is new style, NEED_TELLDIR_PROTO is old style. --JHI 1999-Feb-02 */ # if !defined(HAS_TELLDIR_PROTO) || defined(NEED_TELLDIR_PROTO) - long telldir _((DIR *)); + long telldir (DIR *); # endif GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); diff --git a/proto.h b/proto.h index 7c8f8a3..018eef4 100644 --- a/proto.h +++ b/proto.h @@ -22,963 +22,963 @@ START_EXTERN_C #define __attribute__(attr) #endif #endif -VIRTUAL SV* amagic_call _((SV* left,SV* right,int method,int dir)); -VIRTUAL bool Gv_AMupdate _((HV* stash)); -VIRTUAL OP* append_elem _((I32 optype, OP* head, OP* tail)); -VIRTUAL OP* append_list _((I32 optype, LISTOP* first, LISTOP* last)); -VIRTUAL I32 apply _((I32 type, SV** mark, SV** sp)); -VIRTUAL void assertref _((OP* o)); -VIRTUAL bool avhv_exists_ent _((AV *ar, SV* keysv, U32 hash)); -VIRTUAL SV** avhv_fetch_ent _((AV *ar, SV* keysv, I32 lval, U32 hash)); -VIRTUAL HE* avhv_iternext _((AV *ar)); -VIRTUAL SV* avhv_iterval _((AV *ar, HE* entry)); -VIRTUAL HV* avhv_keys _((AV *ar)); -VIRTUAL void av_clear _((AV* ar)); -VIRTUAL void av_extend _((AV* ar, I32 key)); -VIRTUAL AV* av_fake _((I32 size, SV** svp)); -VIRTUAL SV** av_fetch _((AV* ar, I32 key, I32 lval)); -VIRTUAL void av_fill _((AV* ar, I32 fill)); -VIRTUAL I32 av_len _((AV* ar)); -VIRTUAL AV* av_make _((I32 size, SV** svp)); -VIRTUAL SV* av_pop _((AV* ar)); -VIRTUAL void av_push _((AV* ar, SV* val)); -VIRTUAL void av_reify _((AV* ar)); -VIRTUAL SV* av_shift _((AV* ar)); -VIRTUAL SV** av_store _((AV* ar, I32 key, SV* val)); -VIRTUAL void av_undef _((AV* ar)); -VIRTUAL void av_unshift _((AV* ar, I32 num)); -VIRTUAL OP* bind_match _((I32 type, OP* left, OP* pat)); -VIRTUAL OP* block_end _((I32 floor, OP* seq)); -VIRTUAL I32 block_gimme _((void)); -VIRTUAL int block_start _((int full)); -VIRTUAL void boot_core_UNIVERSAL _((void)); -VIRTUAL void call_list _((I32 oldscope, AV* av_list)); -VIRTUAL I32 cando _((I32 bit, I32 effective, Stat_t* statbufp)); -VIRTUAL U32 cast_ulong _((double f)); -VIRTUAL I32 cast_i32 _((double f)); -VIRTUAL IV cast_iv _((double f)); -VIRTUAL UV cast_uv _((double f)); +VIRTUAL SV* amagic_call (SV* left,SV* right,int method,int dir); +VIRTUAL bool Gv_AMupdate (HV* stash); +VIRTUAL OP* append_elem (I32 optype, OP* head, OP* tail); +VIRTUAL OP* append_list (I32 optype, LISTOP* first, LISTOP* last); +VIRTUAL I32 apply (I32 type, SV** mark, SV** sp); +VIRTUAL void assertref (OP* o); +VIRTUAL bool avhv_exists_ent (AV *ar, SV* keysv, U32 hash); +VIRTUAL SV** avhv_fetch_ent (AV *ar, SV* keysv, I32 lval, U32 hash); +VIRTUAL HE* avhv_iternext (AV *ar); +VIRTUAL SV* avhv_iterval (AV *ar, HE* entry); +VIRTUAL HV* avhv_keys (AV *ar); +VIRTUAL void av_clear (AV* ar); +VIRTUAL void av_extend (AV* ar, I32 key); +VIRTUAL AV* av_fake (I32 size, SV** svp); +VIRTUAL SV** av_fetch (AV* ar, I32 key, I32 lval); +VIRTUAL void av_fill (AV* ar, I32 fill); +VIRTUAL I32 av_len (AV* ar); +VIRTUAL AV* av_make (I32 size, SV** svp); +VIRTUAL SV* av_pop (AV* ar); +VIRTUAL void av_push (AV* ar, SV* val); +VIRTUAL void av_reify (AV* ar); +VIRTUAL SV* av_shift (AV* ar); +VIRTUAL SV** av_store (AV* ar, I32 key, SV* val); +VIRTUAL void av_undef (AV* ar); +VIRTUAL void av_unshift (AV* ar, I32 num); +VIRTUAL OP* bind_match (I32 type, OP* left, OP* pat); +VIRTUAL OP* block_end (I32 floor, OP* seq); +VIRTUAL I32 block_gimme (void); +VIRTUAL int block_start (int full); +VIRTUAL void boot_core_UNIVERSAL (void); +VIRTUAL void call_list (I32 oldscope, AV* av_list); +VIRTUAL I32 cando (I32 bit, I32 effective, Stat_t* statbufp); +VIRTUAL U32 cast_ulong (double f); +VIRTUAL I32 cast_i32 (double f); +VIRTUAL IV cast_iv (double f); +VIRTUAL UV cast_uv (double f); #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP) -VIRTUAL I32 my_chsize _((int fd, Off_t length)); +VIRTUAL I32 my_chsize (int fd, Off_t length); #endif #ifdef USE_THREADS -VIRTUAL MAGIC * condpair_magic _((SV *sv)); -#endif -VIRTUAL OP* convert _((I32 optype, I32 flags, OP* o)); -VIRTUAL void croak _((const char* pat,...)) __attribute__((noreturn)); -VIRTUAL void cv_ckproto _((CV* cv, GV* gv, char* p)); -VIRTUAL CV* cv_clone _((CV* proto)); -VIRTUAL SV* cv_const_sv _((CV* cv)); -VIRTUAL SV* op_const_sv _((OP* o, CV* cv)); -VIRTUAL void cv_undef _((CV* cv)); -VIRTUAL void cx_dump _((PERL_CONTEXT* cs)); -VIRTUAL SV* filter_add _((filter_t funcp, SV* datasv)); -VIRTUAL void filter_del _((filter_t funcp)); -VIRTUAL I32 filter_read _((int idx, SV* buffer, int maxlen)); -VIRTUAL char ** get_op_descs _((void)); -VIRTUAL char ** get_op_names _((void)); -VIRTUAL char * get_no_modify _((void)); -VIRTUAL U32 * get_opargs _((void)); -VIRTUAL I32 cxinc _((void)); -VIRTUAL void deb _((const char* pat,...)); -VIRTUAL void deb_growlevel _((void)); -VIRTUAL void debprofdump _((void)); -VIRTUAL I32 debop _((OP* o)); -VIRTUAL I32 debstack _((void)); -VIRTUAL I32 debstackptrs _((void)); -VIRTUAL char* delimcpy _((char* to, char* toend, char* from, char* fromend, - int delim, I32* retlen)); -VIRTUAL void deprecate _((char* s)); -VIRTUAL OP* die _((const char* pat,...)); -VIRTUAL OP* die_where _((char* message, STRLEN msglen)); -VIRTUAL void dounwind _((I32 cxix)); -VIRTUAL bool do_aexec _((SV* really, SV** mark, SV** sp)); -VIRTUAL int do_binmode _((PerlIO *fp, int iotype, int flag)); -VIRTUAL void do_chop _((SV* asv, SV* sv)); -VIRTUAL bool do_close _((GV* gv, bool not_implicit)); -VIRTUAL bool do_eof _((GV* gv)); -VIRTUAL bool do_exec _((char* cmd)); +VIRTUAL MAGIC * condpair_magic (SV *sv); +#endif +VIRTUAL OP* convert (I32 optype, I32 flags, OP* o); +VIRTUAL void croak (const char* pat,...) __attribute__((noreturn)); +VIRTUAL void cv_ckproto (CV* cv, GV* gv, char* p); +VIRTUAL CV* cv_clone (CV* proto); +VIRTUAL SV* cv_const_sv (CV* cv); +VIRTUAL SV* op_const_sv (OP* o, CV* cv); +VIRTUAL void cv_undef (CV* cv); +VIRTUAL void cx_dump (PERL_CONTEXT* cs); +VIRTUAL SV* filter_add (filter_t funcp, SV* datasv); +VIRTUAL void filter_del (filter_t funcp); +VIRTUAL I32 filter_read (int idx, SV* buffer, int maxlen); +VIRTUAL char ** get_op_descs (void); +VIRTUAL char ** get_op_names (void); +VIRTUAL char * get_no_modify (void); +VIRTUAL U32 * get_opargs (void); +VIRTUAL I32 cxinc (void); +VIRTUAL void deb (const char* pat,...); +VIRTUAL void deb_growlevel (void); +VIRTUAL void debprofdump (void); +VIRTUAL I32 debop (OP* o); +VIRTUAL I32 debstack (void); +VIRTUAL I32 debstackptrs (void); +VIRTUAL char* delimcpy (char* to, char* toend, char* from, char* fromend, + int delim, I32* retlen); +VIRTUAL void deprecate (char* s); +VIRTUAL OP* die (const char* pat,...); +VIRTUAL OP* die_where (char* message, STRLEN msglen); +VIRTUAL void dounwind (I32 cxix); +VIRTUAL bool do_aexec (SV* really, SV** mark, SV** sp); +VIRTUAL int do_binmode (PerlIO *fp, int iotype, int flag); +VIRTUAL void do_chop (SV* asv, SV* sv); +VIRTUAL bool do_close (GV* gv, bool not_implicit); +VIRTUAL bool do_eof (GV* gv); +VIRTUAL bool do_exec (char* cmd); #ifndef WIN32 -VIRTUAL bool do_exec3 _((char* cmd, int fd, int flag)); +VIRTUAL bool do_exec3 (char* cmd, int fd, int flag); #endif -VIRTUAL void do_execfree _((void)); +VIRTUAL void do_execfree (void); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) -I32 do_ipcctl _((I32 optype, SV** mark, SV** sp)); -I32 do_ipcget _((I32 optype, SV** mark, SV** sp)); +I32 do_ipcctl (I32 optype, SV** mark, SV** sp); +I32 do_ipcget (I32 optype, SV** mark, SV** sp); #endif -VIRTUAL void do_join _((SV* sv, SV* del, SV** mark, SV** sp)); -VIRTUAL OP* do_kv _((ARGSproto)); +VIRTUAL void do_join (SV* sv, SV* del, SV** mark, SV** sp); +VIRTUAL OP* do_kv (ARGSproto); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) -I32 do_msgrcv _((SV** mark, SV** sp)); -I32 do_msgsnd _((SV** mark, SV** sp)); -#endif -VIRTUAL bool do_open _((GV* gv, char* name, I32 len, - int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp)); -VIRTUAL void do_pipe _((SV* sv, GV* rgv, GV* wgv)); -VIRTUAL bool do_print _((SV* sv, PerlIO* fp)); -VIRTUAL OP* do_readline _((void)); -VIRTUAL I32 do_chomp _((SV* sv)); -VIRTUAL bool do_seek _((GV* gv, Off_t pos, int whence)); +I32 do_msgrcv (SV** mark, SV** sp); +I32 do_msgsnd (SV** mark, SV** sp); +#endif +VIRTUAL bool do_open (GV* gv, char* name, I32 len, + int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp); +VIRTUAL void do_pipe (SV* sv, GV* rgv, GV* wgv); +VIRTUAL bool do_print (SV* sv, PerlIO* fp); +VIRTUAL OP* do_readline (void); +VIRTUAL I32 do_chomp (SV* sv); +VIRTUAL bool do_seek (GV* gv, Off_t pos, int whence); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) -I32 do_semop _((SV** mark, SV** sp)); -I32 do_shmio _((I32 optype, SV** mark, SV** sp)); -#endif -VIRTUAL void do_sprintf _((SV* sv, I32 len, SV** sarg)); -VIRTUAL Off_t do_sysseek _((GV* gv, Off_t pos, int whence)); -VIRTUAL Off_t do_tell _((GV* gv)); -VIRTUAL I32 do_trans _((SV* sv)); -VIRTUAL void do_vecset _((SV* sv)); -VIRTUAL void do_vop _((I32 optype, SV* sv, SV* left, SV* right)); -VIRTUAL OP* dofile _((OP* term)); -VIRTUAL I32 dowantarray _((void)); -VIRTUAL void dump_all _((void)); -VIRTUAL void dump_eval _((void)); +I32 do_semop (SV** mark, SV** sp); +I32 do_shmio (I32 optype, SV** mark, SV** sp); +#endif +VIRTUAL void do_sprintf (SV* sv, I32 len, SV** sarg); +VIRTUAL Off_t do_sysseek (GV* gv, Off_t pos, int whence); +VIRTUAL Off_t do_tell (GV* gv); +VIRTUAL I32 do_trans (SV* sv); +VIRTUAL void do_vecset (SV* sv); +VIRTUAL void do_vop (I32 optype, SV* sv, SV* left, SV* right); +VIRTUAL OP* dofile (OP* term); +VIRTUAL I32 dowantarray (void); +VIRTUAL void dump_all (void); +VIRTUAL void dump_eval (void); #ifdef DUMP_FDS /* See util.c */ -VIRTUAL void dump_fds _((char* s)); +VIRTUAL void dump_fds (char* s); #endif -VIRTUAL void dump_form _((GV* gv)); -VIRTUAL void gv_dump _((GV* gv)); +VIRTUAL void dump_form (GV* gv); +VIRTUAL void gv_dump (GV* gv); #ifdef MYMALLOC -VIRTUAL void dump_mstats _((char* s)); -#endif -VIRTUAL void op_dump _((OP* arg)); -VIRTUAL void pmop_dump _((PMOP* pm)); -VIRTUAL void dump_packsubs _((HV* stash)); -VIRTUAL void dump_sub _((GV* gv)); -VIRTUAL void fbm_compile _((SV* sv, U32 flags)); -VIRTUAL char* fbm_instr _((unsigned char* big, unsigned char* bigend, SV* littlesv, U32 flags)); -VIRTUAL char* find_script _((char *scriptname, bool dosearch, char **search_ext, I32 flags)); +VIRTUAL void dump_mstats (char* s); +#endif +VIRTUAL void op_dump (OP* arg); +VIRTUAL void pmop_dump (PMOP* pm); +VIRTUAL void dump_packsubs (HV* stash); +VIRTUAL void dump_sub (GV* gv); +VIRTUAL void fbm_compile (SV* sv, U32 flags); +VIRTUAL char* fbm_instr (unsigned char* big, unsigned char* bigend, SV* littlesv, U32 flags); +VIRTUAL char* find_script (char *scriptname, bool dosearch, char **search_ext, I32 flags); #ifdef USE_THREADS -VIRTUAL PADOFFSET find_threadsv _((const char *name)); +VIRTUAL PADOFFSET find_threadsv (const char *name); #endif -VIRTUAL OP* force_list _((OP* arg)); -VIRTUAL OP* fold_constants _((OP* arg)); -VIRTUAL char* form _((const char* pat, ...)); -VIRTUAL void free_tmps _((void)); -VIRTUAL OP* gen_constant_list _((OP* o)); +VIRTUAL OP* force_list (OP* arg); +VIRTUAL OP* fold_constants (OP* arg); +VIRTUAL char* form (const char* pat, ...); +VIRTUAL void free_tmps (void); +VIRTUAL OP* gen_constant_list (OP* o); #ifndef HAS_GETENV_LEN -VIRTUAL char* getenv_len _((char* key, unsigned long *len)); -#endif -VIRTUAL void gp_free _((GV* gv)); -VIRTUAL GP* gp_ref _((GP* gp)); -VIRTUAL GV* gv_AVadd _((GV* gv)); -VIRTUAL GV* gv_HVadd _((GV* gv)); -VIRTUAL GV* gv_IOadd _((GV* gv)); -VIRTUAL GV* gv_autoload4 _((HV* stash, const char* name, STRLEN len, I32 method)); -VIRTUAL void gv_check _((HV* stash)); -VIRTUAL void gv_efullname _((SV* sv, GV* gv)); -VIRTUAL void gv_efullname3 _((SV* sv, GV* gv, const char* prefix)); -VIRTUAL GV* gv_fetchfile _((const char* name)); -VIRTUAL GV* gv_fetchmeth _((HV* stash, const char* name, STRLEN len, I32 level)); -VIRTUAL GV* gv_fetchmethod _((HV* stash, const char* name)); -VIRTUAL GV* gv_fetchmethod_autoload _((HV* stash, const char* name, I32 autoload)); -VIRTUAL GV* gv_fetchpv _((const char* name, I32 add, I32 sv_type)); -VIRTUAL void gv_fullname _((SV* sv, GV* gv)); -VIRTUAL void gv_fullname3 _((SV* sv, GV* gv, const char* prefix)); -VIRTUAL void gv_init _((GV* gv, HV* stash, const char* name, STRLEN len, int multi)); -VIRTUAL HV* gv_stashpv _((const char* name, I32 create)); -VIRTUAL HV* gv_stashpvn _((const char* name, U32 namelen, I32 create)); -VIRTUAL HV* gv_stashsv _((SV* sv, I32 create)); -VIRTUAL void hv_clear _((HV* tb)); -VIRTUAL void hv_delayfree_ent _((HV* hv, HE* entry)); -VIRTUAL SV* hv_delete _((HV* tb, const char* key, U32 klen, I32 flags)); -VIRTUAL SV* hv_delete_ent _((HV* tb, SV* key, I32 flags, U32 hash)); -VIRTUAL bool hv_exists _((HV* tb, const char* key, U32 klen)); -VIRTUAL bool hv_exists_ent _((HV* tb, SV* key, U32 hash)); -VIRTUAL SV** hv_fetch _((HV* tb, const char* key, U32 klen, I32 lval)); -VIRTUAL HE* hv_fetch_ent _((HV* tb, SV* key, I32 lval, U32 hash)); -VIRTUAL void hv_free_ent _((HV* hv, HE* entry)); -VIRTUAL I32 hv_iterinit _((HV* tb)); -VIRTUAL char* hv_iterkey _((HE* entry, I32* retlen)); -VIRTUAL SV* hv_iterkeysv _((HE* entry)); -VIRTUAL HE* hv_iternext _((HV* tb)); -VIRTUAL SV* hv_iternextsv _((HV* hv, char** key, I32* retlen)); -VIRTUAL SV* hv_iterval _((HV* tb, HE* entry)); -VIRTUAL void hv_ksplit _((HV* hv, IV newmax)); -VIRTUAL void hv_magic _((HV* hv, GV* gv, int how)); -VIRTUAL SV** hv_store _((HV* tb, const char* key, U32 klen, SV* val, U32 hash)); -VIRTUAL HE* hv_store_ent _((HV* tb, SV* key, SV* val, U32 hash)); -VIRTUAL void hv_undef _((HV* tb)); -VIRTUAL I32 ibcmp _((const char* a, const char* b, I32 len)); -VIRTUAL I32 ibcmp_locale _((const char* a, const char* b, I32 len)); -VIRTUAL I32 ingroup _((I32 testgid, I32 effective)); -VIRTUAL void init_stacks _((ARGSproto)); -VIRTUAL U32 intro_my _((void)); -VIRTUAL char* instr _((const char* big, const char* little)); -VIRTUAL bool io_close _((IO* io)); -VIRTUAL OP* invert _((OP* cmd)); -VIRTUAL bool is_uni_alnum _((U32 c)); -VIRTUAL bool is_uni_idfirst _((U32 c)); -VIRTUAL bool is_uni_alpha _((U32 c)); -VIRTUAL bool is_uni_space _((U32 c)); -VIRTUAL bool is_uni_digit _((U32 c)); -VIRTUAL bool is_uni_upper _((U32 c)); -VIRTUAL bool is_uni_lower _((U32 c)); -VIRTUAL bool is_uni_print _((U32 c)); -VIRTUAL U32 to_uni_upper _((U32 c)); -VIRTUAL U32 to_uni_title _((U32 c)); -VIRTUAL U32 to_uni_lower _((U32 c)); -VIRTUAL bool is_uni_alnum_lc _((U32 c)); -VIRTUAL bool is_uni_idfirst_lc _((U32 c)); -VIRTUAL bool is_uni_alpha_lc _((U32 c)); -VIRTUAL bool is_uni_space_lc _((U32 c)); -VIRTUAL bool is_uni_digit_lc _((U32 c)); -VIRTUAL bool is_uni_upper_lc _((U32 c)); -VIRTUAL bool is_uni_lower_lc _((U32 c)); -VIRTUAL bool is_uni_print_lc _((U32 c)); -VIRTUAL U32 to_uni_upper_lc _((U32 c)); -VIRTUAL U32 to_uni_title_lc _((U32 c)); -VIRTUAL U32 to_uni_lower_lc _((U32 c)); -VIRTUAL bool is_utf8_alnum _((U8 *p)); -VIRTUAL bool is_utf8_idfirst _((U8 *p)); -VIRTUAL bool is_utf8_alpha _((U8 *p)); -VIRTUAL bool is_utf8_space _((U8 *p)); -VIRTUAL bool is_utf8_digit _((U8 *p)); -VIRTUAL bool is_utf8_upper _((U8 *p)); -VIRTUAL bool is_utf8_lower _((U8 *p)); -VIRTUAL bool is_utf8_print _((U8 *p)); -VIRTUAL bool is_utf8_mark _((U8 *p)); -VIRTUAL OP* jmaybe _((OP* arg)); -VIRTUAL I32 keyword _((char* d, I32 len)); -VIRTUAL void leave_scope _((I32 base)); -VIRTUAL void lex_end _((void)); -VIRTUAL void lex_start _((SV* line)); -VIRTUAL OP* linklist _((OP* o)); -VIRTUAL OP* list _((OP* o)); -VIRTUAL OP* listkids _((OP* o)); -VIRTUAL OP* localize _((OP* arg, I32 lexical)); -VIRTUAL I32 looks_like_number _((SV* sv)); -VIRTUAL int magic_clearenv _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_clear_all_env _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_clearpack _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_clearsig _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_existspack _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_freeregexp _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_get _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getarylen _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getdefelem _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getglob _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getnkeys _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getpack _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getpos _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getsig _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getsubstr _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_gettaint _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getuvar _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_getvec _((SV* sv, MAGIC* mg)); -VIRTUAL U32 magic_len _((SV* sv, MAGIC* mg)); +VIRTUAL char* getenv_len (char* key, unsigned long *len); +#endif +VIRTUAL void gp_free (GV* gv); +VIRTUAL GP* gp_ref (GP* gp); +VIRTUAL GV* gv_AVadd (GV* gv); +VIRTUAL GV* gv_HVadd (GV* gv); +VIRTUAL GV* gv_IOadd (GV* gv); +VIRTUAL GV* gv_autoload4 (HV* stash, const char* name, STRLEN len, I32 method); +VIRTUAL void gv_check (HV* stash); +VIRTUAL void gv_efullname (SV* sv, GV* gv); +VIRTUAL void gv_efullname3 (SV* sv, GV* gv, const char* prefix); +VIRTUAL GV* gv_fetchfile (const char* name); +VIRTUAL GV* gv_fetchmeth (HV* stash, const char* name, STRLEN len, I32 level); +VIRTUAL GV* gv_fetchmethod (HV* stash, const char* name); +VIRTUAL GV* gv_fetchmethod_autoload (HV* stash, const char* name, I32 autoload); +VIRTUAL GV* gv_fetchpv (const char* name, I32 add, I32 sv_type); +VIRTUAL void gv_fullname (SV* sv, GV* gv); +VIRTUAL void gv_fullname3 (SV* sv, GV* gv, const char* prefix); +VIRTUAL void gv_init (GV* gv, HV* stash, const char* name, STRLEN len, int multi); +VIRTUAL HV* gv_stashpv (const char* name, I32 create); +VIRTUAL HV* gv_stashpvn (const char* name, U32 namelen, I32 create); +VIRTUAL HV* gv_stashsv (SV* sv, I32 create); +VIRTUAL void hv_clear (HV* tb); +VIRTUAL void hv_delayfree_ent (HV* hv, HE* entry); +VIRTUAL SV* hv_delete (HV* tb, const char* key, U32 klen, I32 flags); +VIRTUAL SV* hv_delete_ent (HV* tb, SV* key, I32 flags, U32 hash); +VIRTUAL bool hv_exists (HV* tb, const char* key, U32 klen); +VIRTUAL bool hv_exists_ent (HV* tb, SV* key, U32 hash); +VIRTUAL SV** hv_fetch (HV* tb, const char* key, U32 klen, I32 lval); +VIRTUAL HE* hv_fetch_ent (HV* tb, SV* key, I32 lval, U32 hash); +VIRTUAL void hv_free_ent (HV* hv, HE* entry); +VIRTUAL I32 hv_iterinit (HV* tb); +VIRTUAL char* hv_iterkey (HE* entry, I32* retlen); +VIRTUAL SV* hv_iterkeysv (HE* entry); +VIRTUAL HE* hv_iternext (HV* tb); +VIRTUAL SV* hv_iternextsv (HV* hv, char** key, I32* retlen); +VIRTUAL SV* hv_iterval (HV* tb, HE* entry); +VIRTUAL void hv_ksplit (HV* hv, IV newmax); +VIRTUAL void hv_magic (HV* hv, GV* gv, int how); +VIRTUAL SV** hv_store (HV* tb, const char* key, U32 klen, SV* val, U32 hash); +VIRTUAL HE* hv_store_ent (HV* tb, SV* key, SV* val, U32 hash); +VIRTUAL void hv_undef (HV* tb); +VIRTUAL I32 ibcmp (const char* a, const char* b, I32 len); +VIRTUAL I32 ibcmp_locale (const char* a, const char* b, I32 len); +VIRTUAL I32 ingroup (I32 testgid, I32 effective); +VIRTUAL void init_stacks (ARGSproto); +VIRTUAL U32 intro_my (void); +VIRTUAL char* instr (const char* big, const char* little); +VIRTUAL bool io_close (IO* io); +VIRTUAL OP* invert (OP* cmd); +VIRTUAL bool is_uni_alnum (U32 c); +VIRTUAL bool is_uni_idfirst (U32 c); +VIRTUAL bool is_uni_alpha (U32 c); +VIRTUAL bool is_uni_space (U32 c); +VIRTUAL bool is_uni_digit (U32 c); +VIRTUAL bool is_uni_upper (U32 c); +VIRTUAL bool is_uni_lower (U32 c); +VIRTUAL bool is_uni_print (U32 c); +VIRTUAL U32 to_uni_upper (U32 c); +VIRTUAL U32 to_uni_title (U32 c); +VIRTUAL U32 to_uni_lower (U32 c); +VIRTUAL bool is_uni_alnum_lc (U32 c); +VIRTUAL bool is_uni_idfirst_lc (U32 c); +VIRTUAL bool is_uni_alpha_lc (U32 c); +VIRTUAL bool is_uni_space_lc (U32 c); +VIRTUAL bool is_uni_digit_lc (U32 c); +VIRTUAL bool is_uni_upper_lc (U32 c); +VIRTUAL bool is_uni_lower_lc (U32 c); +VIRTUAL bool is_uni_print_lc (U32 c); +VIRTUAL U32 to_uni_upper_lc (U32 c); +VIRTUAL U32 to_uni_title_lc (U32 c); +VIRTUAL U32 to_uni_lower_lc (U32 c); +VIRTUAL bool is_utf8_alnum (U8 *p); +VIRTUAL bool is_utf8_idfirst (U8 *p); +VIRTUAL bool is_utf8_alpha (U8 *p); +VIRTUAL bool is_utf8_space (U8 *p); +VIRTUAL bool is_utf8_digit (U8 *p); +VIRTUAL bool is_utf8_upper (U8 *p); +VIRTUAL bool is_utf8_lower (U8 *p); +VIRTUAL bool is_utf8_print (U8 *p); +VIRTUAL bool is_utf8_mark (U8 *p); +VIRTUAL OP* jmaybe (OP* arg); +VIRTUAL I32 keyword (char* d, I32 len); +VIRTUAL void leave_scope (I32 base); +VIRTUAL void lex_end (void); +VIRTUAL void lex_start (SV* line); +VIRTUAL OP* linklist (OP* o); +VIRTUAL OP* list (OP* o); +VIRTUAL OP* listkids (OP* o); +VIRTUAL OP* localize (OP* arg, I32 lexical); +VIRTUAL I32 looks_like_number (SV* sv); +VIRTUAL int magic_clearenv (SV* sv, MAGIC* mg); +VIRTUAL int magic_clear_all_env (SV* sv, MAGIC* mg); +VIRTUAL int magic_clearpack (SV* sv, MAGIC* mg); +VIRTUAL int magic_clearsig (SV* sv, MAGIC* mg); +VIRTUAL int magic_existspack (SV* sv, MAGIC* mg); +VIRTUAL int magic_freeregexp (SV* sv, MAGIC* mg); +VIRTUAL int magic_get (SV* sv, MAGIC* mg); +VIRTUAL int magic_getarylen (SV* sv, MAGIC* mg); +VIRTUAL int magic_getdefelem (SV* sv, MAGIC* mg); +VIRTUAL int magic_getglob (SV* sv, MAGIC* mg); +VIRTUAL int magic_getnkeys (SV* sv, MAGIC* mg); +VIRTUAL int magic_getpack (SV* sv, MAGIC* mg); +VIRTUAL int magic_getpos (SV* sv, MAGIC* mg); +VIRTUAL int magic_getsig (SV* sv, MAGIC* mg); +VIRTUAL int magic_getsubstr (SV* sv, MAGIC* mg); +VIRTUAL int magic_gettaint (SV* sv, MAGIC* mg); +VIRTUAL int magic_getuvar (SV* sv, MAGIC* mg); +VIRTUAL int magic_getvec (SV* sv, MAGIC* mg); +VIRTUAL U32 magic_len (SV* sv, MAGIC* mg); #ifdef USE_THREADS -VIRTUAL int magic_mutexfree _((SV* sv, MAGIC* mg)); +VIRTUAL int magic_mutexfree (SV* sv, MAGIC* mg); #endif /* USE_THREADS */ -VIRTUAL int magic_nextpack _((SV* sv, MAGIC* mg, SV* key)); -VIRTUAL U32 magic_regdata_cnt _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_regdatum_get _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_set _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setamagic _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setarylen _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setbm _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setdbline _((SV* sv, MAGIC* mg)); +VIRTUAL int magic_nextpack (SV* sv, MAGIC* mg, SV* key); +VIRTUAL U32 magic_regdata_cnt (SV* sv, MAGIC* mg); +VIRTUAL int magic_regdatum_get (SV* sv, MAGIC* mg); +VIRTUAL int magic_set (SV* sv, MAGIC* mg); +VIRTUAL int magic_setamagic (SV* sv, MAGIC* mg); +VIRTUAL int magic_setarylen (SV* sv, MAGIC* mg); +VIRTUAL int magic_setbm (SV* sv, MAGIC* mg); +VIRTUAL int magic_setdbline (SV* sv, MAGIC* mg); #ifdef USE_LOCALE_COLLATE -VIRTUAL int magic_setcollxfrm _((SV* sv, MAGIC* mg)); -#endif -VIRTUAL int magic_setdefelem _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setenv _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setfm _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setisa _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setglob _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setmglob _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setnkeys _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setpack _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setpos _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setsig _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setsubstr _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_settaint _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setuvar _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_setvec _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_set_all_env _((SV* sv, MAGIC* mg)); -VIRTUAL U32 magic_sizepack _((SV* sv, MAGIC* mg)); -VIRTUAL int magic_wipepack _((SV* sv, MAGIC* mg)); -VIRTUAL void magicname _((char* sym, char* name, I32 namlen)); -int main _((int argc, char** argv, char** env)); +VIRTUAL int magic_setcollxfrm (SV* sv, MAGIC* mg); +#endif +VIRTUAL int magic_setdefelem (SV* sv, MAGIC* mg); +VIRTUAL int magic_setenv (SV* sv, MAGIC* mg); +VIRTUAL int magic_setfm (SV* sv, MAGIC* mg); +VIRTUAL int magic_setisa (SV* sv, MAGIC* mg); +VIRTUAL int magic_setglob (SV* sv, MAGIC* mg); +VIRTUAL int magic_setmglob (SV* sv, MAGIC* mg); +VIRTUAL int magic_setnkeys (SV* sv, MAGIC* mg); +VIRTUAL int magic_setpack (SV* sv, MAGIC* mg); +VIRTUAL int magic_setpos (SV* sv, MAGIC* mg); +VIRTUAL int magic_setsig (SV* sv, MAGIC* mg); +VIRTUAL int magic_setsubstr (SV* sv, MAGIC* mg); +VIRTUAL int magic_settaint (SV* sv, MAGIC* mg); +VIRTUAL int magic_setuvar (SV* sv, MAGIC* mg); +VIRTUAL int magic_setvec (SV* sv, MAGIC* mg); +VIRTUAL int magic_set_all_env (SV* sv, MAGIC* mg); +VIRTUAL U32 magic_sizepack (SV* sv, MAGIC* mg); +VIRTUAL int magic_wipepack (SV* sv, MAGIC* mg); +VIRTUAL void magicname (char* sym, char* name, I32 namlen); +int main (int argc, char** argv, char** env); #ifdef MYMALLOC -VIRTUAL MEM_SIZE malloced_size _((void *p)); +VIRTUAL MEM_SIZE malloced_size (void *p); #endif -VIRTUAL void markstack_grow _((void)); +VIRTUAL void markstack_grow (void); #ifdef USE_LOCALE_COLLATE -VIRTUAL char* mem_collxfrm _((const char* s, STRLEN len, STRLEN* xlen)); -#endif -VIRTUAL SV* mess _((const char* pat, va_list* args)); -VIRTUAL int mg_clear _((SV* sv)); -VIRTUAL int mg_copy _((SV* sv, SV* nsv, const char* key, I32 klen)); -VIRTUAL MAGIC* mg_find _((SV* sv, int type)); -VIRTUAL int mg_free _((SV* sv)); -VIRTUAL int mg_get _((SV* sv)); -VIRTUAL U32 mg_length _((SV* sv)); -VIRTUAL void mg_magical _((SV* sv)); -VIRTUAL int mg_set _((SV* sv)); -VIRTUAL I32 mg_size _((SV* sv)); -VIRTUAL OP* mod _((OP* o, I32 type)); -VIRTUAL char* moreswitches _((char* s)); -VIRTUAL OP* my _((OP* o)); +VIRTUAL char* mem_collxfrm (const char* s, STRLEN len, STRLEN* xlen); +#endif +VIRTUAL SV* mess (const char* pat, va_list* args); +VIRTUAL int mg_clear (SV* sv); +VIRTUAL int mg_copy (SV* sv, SV* nsv, const char* key, I32 klen); +VIRTUAL MAGIC* mg_find (SV* sv, int type); +VIRTUAL int mg_free (SV* sv); +VIRTUAL int mg_get (SV* sv); +VIRTUAL U32 mg_length (SV* sv); +VIRTUAL void mg_magical (SV* sv); +VIRTUAL int mg_set (SV* sv); +VIRTUAL I32 mg_size (SV* sv); +VIRTUAL OP* mod (OP* o, I32 type); +VIRTUAL char* moreswitches (char* s); +VIRTUAL OP* my (OP* o); #if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY) -VIRTUAL char* my_bcopy _((const char* from, char* to, I32 len)); +VIRTUAL char* my_bcopy (const char* from, char* to, I32 len); #endif #if !defined(HAS_BZERO) && !defined(HAS_MEMSET) -char* my_bzero _((char* loc, I32 len)); +char* my_bzero (char* loc, I32 len); #endif -VIRTUAL void my_exit _((U32 status)) __attribute__((noreturn)); -VIRTUAL void my_failure_exit _((void)) __attribute__((noreturn)); -VIRTUAL I32 my_fflush_all _((void)); -VIRTUAL I32 my_lstat _((ARGSproto)); +VIRTUAL void my_exit (U32 status) __attribute__((noreturn)); +VIRTUAL void my_failure_exit (void) __attribute__((noreturn)); +VIRTUAL I32 my_fflush_all (void); +VIRTUAL I32 my_lstat (ARGSproto); #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP) -VIRTUAL I32 my_memcmp _((const char* s1, const char* s2, I32 len)); +VIRTUAL I32 my_memcmp (const char* s1, const char* s2, I32 len); #endif #if !defined(HAS_MEMSET) -VIRTUAL void* my_memset _((char* loc, I32 ch, I32 len)); +VIRTUAL void* my_memset (char* loc, I32 ch, I32 len); #endif #ifndef PERL_OBJECT -VIRTUAL I32 my_pclose _((PerlIO* ptr)); -VIRTUAL PerlIO* my_popen _((char* cmd, char* mode)); +VIRTUAL I32 my_pclose (PerlIO* ptr); +VIRTUAL PerlIO* my_popen (char* cmd, char* mode); #endif -VIRTUAL void my_setenv _((char* nam, char* val)); -VIRTUAL I32 my_stat _((ARGSproto)); +VIRTUAL void my_setenv (char* nam, char* val); +VIRTUAL I32 my_stat (ARGSproto); #ifdef MYSWAP -VIRTUAL short my_swap _((short s)); -VIRTUAL long my_htonl _((long l)); -VIRTUAL long my_ntohl _((long l)); -#endif -VIRTUAL void my_unexec _((void)); -VIRTUAL OP* newANONLIST _((OP* o)); -VIRTUAL OP* newANONHASH _((OP* o)); -VIRTUAL OP* newANONSUB _((I32 floor, OP* proto, OP* block)); -VIRTUAL OP* newASSIGNOP _((I32 flags, OP* left, I32 optype, OP* right)); -VIRTUAL OP* newCONDOP _((I32 flags, OP* expr, OP* trueop, OP* falseop)); -VIRTUAL void newCONSTSUB _((HV* stash, char* name, SV* sv)); -VIRTUAL void newFORM _((I32 floor, OP* o, OP* block)); -VIRTUAL OP* newFOROP _((I32 flags, char* label, line_t forline, OP* sclr, OP* expr, OP*block, OP*cont)); -VIRTUAL OP* newLOGOP _((I32 optype, I32 flags, OP* left, OP* right)); -VIRTUAL OP* newLOOPEX _((I32 type, OP* label)); -VIRTUAL OP* newLOOPOP _((I32 flags, I32 debuggable, OP* expr, OP* block)); -VIRTUAL OP* newNULLLIST _((void)); -VIRTUAL OP* newOP _((I32 optype, I32 flags)); -VIRTUAL void newPROG _((OP* o)); -VIRTUAL OP* newRANGE _((I32 flags, OP* left, OP* right)); -VIRTUAL OP* newSLICEOP _((I32 flags, OP* subscript, OP* listop)); -VIRTUAL OP* newSTATEOP _((I32 flags, char* label, OP* o)); -VIRTUAL CV* newSUB _((I32 floor, OP* o, OP* proto, OP* block)); -VIRTUAL CV* newXS _((char* name, void (*subaddr)(CV* cv _CPERLproto), char* filename)); -VIRTUAL AV* newAV _((void)); -VIRTUAL OP* newAVREF _((OP* o)); -VIRTUAL OP* newBINOP _((I32 type, I32 flags, OP* first, OP* last)); -VIRTUAL OP* newCVREF _((I32 flags, OP* o)); -VIRTUAL OP* newGVOP _((I32 type, I32 flags, GV* gv)); -VIRTUAL GV* newGVgen _((char* pack)); -VIRTUAL OP* newGVREF _((I32 type, OP* o)); -VIRTUAL OP* newHVREF _((OP* o)); -VIRTUAL HV* newHV _((void)); -VIRTUAL HV* newHVhv _((HV* hv)); -VIRTUAL IO* newIO _((void)); -VIRTUAL OP* newLISTOP _((I32 type, I32 flags, OP* first, OP* last)); -VIRTUAL OP* newPMOP _((I32 type, I32 flags)); -VIRTUAL OP* newPVOP _((I32 type, I32 flags, char* pv)); -VIRTUAL SV* newRV _((SV* pref)); -VIRTUAL SV* newRV_noinc _((SV *sv)); -VIRTUAL SV* newSV _((STRLEN len)); -VIRTUAL OP* newSVREF _((OP* o)); -VIRTUAL OP* newSVOP _((I32 type, I32 flags, SV* sv)); -VIRTUAL SV* newSViv _((IV i)); -VIRTUAL SV* newSVnv _((double n)); -VIRTUAL SV* newSVpv _((const char* s, STRLEN len)); -VIRTUAL SV* newSVpvn _((const char *s, STRLEN len)); -VIRTUAL SV* newSVpvf _((const char* pat, ...)); -VIRTUAL SV* newSVrv _((SV* rv, const char* classname)); -VIRTUAL SV* newSVsv _((SV* old)); -VIRTUAL OP* newUNOP _((I32 type, I32 flags, OP* first)); -VIRTUAL OP* newWHILEOP _((I32 flags, I32 debuggable, LOOP* loop, - I32 whileline, OP* expr, OP* block, OP* cont)); +VIRTUAL short my_swap (short s); +VIRTUAL long my_htonl (long l); +VIRTUAL long my_ntohl (long l); +#endif +VIRTUAL void my_unexec (void); +VIRTUAL OP* newANONLIST (OP* o); +VIRTUAL OP* newANONHASH (OP* o); +VIRTUAL OP* newANONSUB (I32 floor, OP* proto, OP* block); +VIRTUAL OP* newASSIGNOP (I32 flags, OP* left, I32 optype, OP* right); +VIRTUAL OP* newCONDOP (I32 flags, OP* expr, OP* trueop, OP* falseop); +VIRTUAL void newCONSTSUB (HV* stash, char* name, SV* sv); +VIRTUAL void newFORM (I32 floor, OP* o, OP* block); +VIRTUAL OP* newFOROP (I32 flags, char* label, line_t forline, OP* sclr, OP* expr, OP*block, OP*cont); +VIRTUAL OP* newLOGOP (I32 optype, I32 flags, OP* left, OP* right); +VIRTUAL OP* newLOOPEX (I32 type, OP* label); +VIRTUAL OP* newLOOPOP (I32 flags, I32 debuggable, OP* expr, OP* block); +VIRTUAL OP* newNULLLIST (void); +VIRTUAL OP* newOP (I32 optype, I32 flags); +VIRTUAL void newPROG (OP* o); +VIRTUAL OP* newRANGE (I32 flags, OP* left, OP* right); +VIRTUAL OP* newSLICEOP (I32 flags, OP* subscript, OP* listop); +VIRTUAL OP* newSTATEOP (I32 flags, char* label, OP* o); +VIRTUAL CV* newSUB (I32 floor, OP* o, OP* proto, OP* block); +VIRTUAL CV* newXS (char* name, void (*subaddr)(CV* cv _CPERLproto), char* filename); +VIRTUAL AV* newAV (void); +VIRTUAL OP* newAVREF (OP* o); +VIRTUAL OP* newBINOP (I32 type, I32 flags, OP* first, OP* last); +VIRTUAL OP* newCVREF (I32 flags, OP* o); +VIRTUAL OP* newGVOP (I32 type, I32 flags, GV* gv); +VIRTUAL GV* newGVgen (char* pack); +VIRTUAL OP* newGVREF (I32 type, OP* o); +VIRTUAL OP* newHVREF (OP* o); +VIRTUAL HV* newHV (void); +VIRTUAL HV* newHVhv (HV* hv); +VIRTUAL IO* newIO (void); +VIRTUAL OP* newLISTOP (I32 type, I32 flags, OP* first, OP* last); +VIRTUAL OP* newPMOP (I32 type, I32 flags); +VIRTUAL OP* newPVOP (I32 type, I32 flags, char* pv); +VIRTUAL SV* newRV (SV* pref); +VIRTUAL SV* newRV_noinc (SV *sv); +VIRTUAL SV* newSV (STRLEN len); +VIRTUAL OP* newSVREF (OP* o); +VIRTUAL OP* newSVOP (I32 type, I32 flags, SV* sv); +VIRTUAL SV* newSViv (IV i); +VIRTUAL SV* newSVnv (double n); +VIRTUAL SV* newSVpv (const char* s, STRLEN len); +VIRTUAL SV* newSVpvn (const char *s, STRLEN len); +VIRTUAL SV* newSVpvf (const char* pat, ...); +VIRTUAL SV* newSVrv (SV* rv, const char* classname); +VIRTUAL SV* newSVsv (SV* old); +VIRTUAL OP* newUNOP (I32 type, I32 flags, OP* first); +VIRTUAL OP* newWHILEOP (I32 flags, I32 debuggable, LOOP* loop, + I32 whileline, OP* expr, OP* block, OP* cont); #ifdef USE_THREADS -VIRTUAL struct perl_thread * new_struct_thread _((struct perl_thread *t)); -#endif -VIRTUAL PERL_SI * new_stackinfo _((I32 stitems, I32 cxitems)); -VIRTUAL PerlIO* nextargv _((GV* gv)); -VIRTUAL char* ninstr _((const char* big, const char* bigend, const char* little, const char* lend)); -VIRTUAL OP* oopsCV _((OP* o)); -VIRTUAL void op_free _((OP* arg)); -VIRTUAL void package _((OP* o)); -VIRTUAL PADOFFSET pad_alloc _((I32 optype, U32 tmptype)); -VIRTUAL PADOFFSET pad_allocmy _((char* name)); -VIRTUAL PADOFFSET pad_findmy _((char* name)); -VIRTUAL OP* oopsAV _((OP* o)); -VIRTUAL OP* oopsHV _((OP* o)); -VIRTUAL void pad_leavemy _((I32 fill)); -VIRTUAL SV* pad_sv _((PADOFFSET po)); -VIRTUAL void pad_free _((PADOFFSET po)); -VIRTUAL void pad_reset _((void)); -VIRTUAL void pad_swipe _((PADOFFSET po)); -VIRTUAL void peep _((OP* o)); +VIRTUAL struct perl_thread * new_struct_thread (struct perl_thread *t); +#endif +VIRTUAL PERL_SI * new_stackinfo (I32 stitems, I32 cxitems); +VIRTUAL PerlIO* nextargv (GV* gv); +VIRTUAL char* ninstr (const char* big, const char* bigend, const char* little, const char* lend); +VIRTUAL OP* oopsCV (OP* o); +VIRTUAL void op_free (OP* arg); +VIRTUAL void package (OP* o); +VIRTUAL PADOFFSET pad_alloc (I32 optype, U32 tmptype); +VIRTUAL PADOFFSET pad_allocmy (char* name); +VIRTUAL PADOFFSET pad_findmy (char* name); +VIRTUAL OP* oopsAV (OP* o); +VIRTUAL OP* oopsHV (OP* o); +VIRTUAL void pad_leavemy (I32 fill); +VIRTUAL SV* pad_sv (PADOFFSET po); +VIRTUAL void pad_free (PADOFFSET po); +VIRTUAL void pad_reset (void); +VIRTUAL void pad_swipe (PADOFFSET po); +VIRTUAL void peep (OP* o); #ifndef PERL_OBJECT -PerlInterpreter* perl_alloc _((void)); +PerlInterpreter* perl_alloc (void); #endif #ifdef PERL_OBJECT -VIRTUAL void perl_atexit _((void(*fn)(CPerlObj *, void *), void* ptr)); +VIRTUAL void perl_atexit (void(*fn)(CPerlObj *, void *), void* ptr); #else -void perl_atexit _((void(*fn)(void *), void*)); +void perl_atexit (void(*fn)(void *), void*); #endif -VIRTUAL I32 perl_call_argv _((const char* sub_name, I32 flags, char** argv)); -VIRTUAL I32 perl_call_method _((const char* methname, I32 flags)); -VIRTUAL I32 perl_call_pv _((const char* sub_name, I32 flags)); -VIRTUAL I32 perl_call_sv _((SV* sv, I32 flags)); +VIRTUAL I32 perl_call_argv (const char* sub_name, I32 flags, char** argv); +VIRTUAL I32 perl_call_method (const char* methname, I32 flags); +VIRTUAL I32 perl_call_pv (const char* sub_name, I32 flags); +VIRTUAL I32 perl_call_sv (SV* sv, I32 flags); #ifdef PERL_OBJECT -VIRTUAL void perl_construct _((void)); -VIRTUAL void perl_destruct _((void)); +VIRTUAL void perl_construct (void); +VIRTUAL void perl_destruct (void); #else -void perl_construct _((PerlInterpreter* sv_interp)); -void perl_destruct _((PerlInterpreter* sv_interp)); +void perl_construct (PerlInterpreter* sv_interp); +void perl_destruct (PerlInterpreter* sv_interp); #endif -VIRTUAL SV* perl_eval_pv _((const char* p, I32 croak_on_error)); -VIRTUAL I32 perl_eval_sv _((SV* sv, I32 flags)); +VIRTUAL SV* perl_eval_pv (const char* p, I32 croak_on_error); +VIRTUAL I32 perl_eval_sv (SV* sv, I32 flags); #ifdef PERL_OBJECT -VIRTUAL void perl_free _((void)); +VIRTUAL void perl_free (void); #else -void perl_free _((PerlInterpreter* sv_interp)); -#endif -VIRTUAL SV* perl_get_sv _((const char* name, I32 create)); -VIRTUAL AV* perl_get_av _((const char* name, I32 create)); -VIRTUAL HV* perl_get_hv _((const char* name, I32 create)); -VIRTUAL CV* perl_get_cv _((const char* name, I32 create)); -VIRTUAL int perl_init_i18nl10n _((int printwarn)); -VIRTUAL int perl_init_i18nl14n _((int printwarn)); -VIRTUAL void perl_new_collate _((const char* newcoll)); -VIRTUAL void perl_new_ctype _((const char* newctype)); -VIRTUAL void perl_new_numeric _((const char* newcoll)); -VIRTUAL void perl_set_numeric_local _((void)); -VIRTUAL void perl_set_numeric_standard _((void)); +void perl_free (PerlInterpreter* sv_interp); +#endif +VIRTUAL SV* perl_get_sv (const char* name, I32 create); +VIRTUAL AV* perl_get_av (const char* name, I32 create); +VIRTUAL HV* perl_get_hv (const char* name, I32 create); +VIRTUAL CV* perl_get_cv (const char* name, I32 create); +VIRTUAL int perl_init_i18nl10n (int printwarn); +VIRTUAL int perl_init_i18nl14n (int printwarn); +VIRTUAL void perl_new_collate (const char* newcoll); +VIRTUAL void perl_new_ctype (const char* newctype); +VIRTUAL void perl_new_numeric (const char* newcoll); +VIRTUAL void perl_set_numeric_local (void); +VIRTUAL void perl_set_numeric_standard (void); #ifdef PERL_OBJECT -VIRTUAL int perl_parse _((void(*xsinit)(CPerlObj*), int argc, char** argv, char** env)); +VIRTUAL int perl_parse (void(*xsinit)(CPerlObj*), int argc, char** argv, char** env); #else -int perl_parse _((PerlInterpreter* sv_interp, void(*xsinit)(void), int argc, char** argv, char** env)); +int perl_parse (PerlInterpreter* sv_interp, void(*xsinit)(void), int argc, char** argv, char** env); #endif -VIRTUAL void perl_require_pv _((const char* pv)); +VIRTUAL void perl_require_pv (const char* pv); #define perl_requirepv perl_require_pv #ifdef PERL_OBJECT -VIRTUAL int perl_run _((void)); +VIRTUAL int perl_run (void); #else -int perl_run _((PerlInterpreter* sv_interp)); -#endif -VIRTUAL void pidgone _((int pid, int status)); -VIRTUAL void pmflag _((U16* pmfl, int ch)); -VIRTUAL OP* pmruntime _((OP* pm, OP* expr, OP* repl)); -VIRTUAL OP* pmtrans _((OP* o, OP* expr, OP* repl)); -VIRTUAL OP* pop_return _((void)); -VIRTUAL void pop_scope _((void)); -VIRTUAL OP* prepend_elem _((I32 optype, OP* head, OP* tail)); -VIRTUAL void push_return _((OP* o)); -VIRTUAL void push_scope _((void)); -VIRTUAL OP* ref _((OP* o, I32 type)); -VIRTUAL OP* refkids _((OP* o, I32 type)); -VIRTUAL void regdump _((regexp* r)); -VIRTUAL I32 pregexec _((regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave)); -VIRTUAL void pregfree _((struct regexp* r)); -VIRTUAL regexp* pregcomp _((char* exp, char* xend, PMOP* pm)); -VIRTUAL I32 regexec_flags _((regexp* prog, char* stringarg, char* strend, +int perl_run (PerlInterpreter* sv_interp); +#endif +VIRTUAL void pidgone (int pid, int status); +VIRTUAL void pmflag (U16* pmfl, int ch); +VIRTUAL OP* pmruntime (OP* pm, OP* expr, OP* repl); +VIRTUAL OP* pmtrans (OP* o, OP* expr, OP* repl); +VIRTUAL OP* pop_return (void); +VIRTUAL void pop_scope (void); +VIRTUAL OP* prepend_elem (I32 optype, OP* head, OP* tail); +VIRTUAL void push_return (OP* o); +VIRTUAL void push_scope (void); +VIRTUAL OP* ref (OP* o, I32 type); +VIRTUAL OP* refkids (OP* o, I32 type); +VIRTUAL void regdump (regexp* r); +VIRTUAL I32 pregexec (regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave); +VIRTUAL void pregfree (struct regexp* r); +VIRTUAL regexp* pregcomp (char* exp, char* xend, PMOP* pm); +VIRTUAL I32 regexec_flags (regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, - void* data, U32 flags)); -VIRTUAL regnode* regnext _((regnode* p)); -VIRTUAL void regprop _((SV* sv, regnode* o)); -VIRTUAL void repeatcpy _((char* to, const char* from, I32 len, I32 count)); -VIRTUAL char* rninstr _((const char* big, const char* bigend, const char* little, const char* lend)); -VIRTUAL Sighandler_t rsignal _((int i, Sighandler_t t)); -VIRTUAL int rsignal_restore _((int i, Sigsave_t* t)); -VIRTUAL int rsignal_save _((int i, Sighandler_t t1, Sigsave_t* t2)); -VIRTUAL Sighandler_t rsignal_state _((int i)); -VIRTUAL void rxres_free _((void** rsp)); -VIRTUAL void rxres_restore _((void** rsp, REGEXP* prx)); -VIRTUAL void rxres_save _((void** rsp, REGEXP* prx)); + void* data, U32 flags); +VIRTUAL regnode* regnext (regnode* p); +VIRTUAL void regprop (SV* sv, regnode* o); +VIRTUAL void repeatcpy (char* to, const char* from, I32 len, I32 count); +VIRTUAL char* rninstr (const char* big, const char* bigend, const char* little, const char* lend); +VIRTUAL Sighandler_t rsignal (int i, Sighandler_t t); +VIRTUAL int rsignal_restore (int i, Sigsave_t* t); +VIRTUAL int rsignal_save (int i, Sighandler_t t1, Sigsave_t* t2); +VIRTUAL Sighandler_t rsignal_state (int i); +VIRTUAL void rxres_free (void** rsp); +VIRTUAL void rxres_restore (void** rsp, REGEXP* prx); +VIRTUAL void rxres_save (void** rsp, REGEXP* prx); #ifndef HAS_RENAME -VIRTUAL I32 same_dirent _((char* a, char* b)); -#endif -VIRTUAL char* savepv _((const char* sv)); -VIRTUAL char* savepvn _((const char* sv, I32 len)); -VIRTUAL void savestack_grow _((void)); -VIRTUAL void save_aelem _((AV* av, I32 idx, SV **sptr)); -VIRTUAL I32 save_alloc _((I32 size, I32 pad)); -VIRTUAL void save_aptr _((AV** aptr)); -VIRTUAL AV* save_ary _((GV* gv)); -VIRTUAL void save_clearsv _((SV** svp)); -VIRTUAL void save_delete _((HV* hv, char* key, I32 klen)); +VIRTUAL I32 same_dirent (char* a, char* b); +#endif +VIRTUAL char* savepv (const char* sv); +VIRTUAL char* savepvn (const char* sv, I32 len); +VIRTUAL void savestack_grow (void); +VIRTUAL void save_aelem (AV* av, I32 idx, SV **sptr); +VIRTUAL I32 save_alloc (I32 size, I32 pad); +VIRTUAL void save_aptr (AV** aptr); +VIRTUAL AV* save_ary (GV* gv); +VIRTUAL void save_clearsv (SV** svp); +VIRTUAL void save_delete (HV* hv, char* key, I32 klen); #ifndef titan /* TitanOS cc can't handle this */ #ifdef PERL_OBJECT -typedef void (CPerlObj::*DESTRUCTORFUNC) _((void*)); -VIRTUAL void save_destructor _((DESTRUCTORFUNC f, void* p)); +typedef void (CPerlObj::*DESTRUCTORFUNC) (void*); +VIRTUAL void save_destructor (DESTRUCTORFUNC f, void* p); #else -void save_destructor _((void (*f)(void*), void* p)); +void save_destructor (void (*f)(void*), void* p); #endif #endif /* titan */ -VIRTUAL void save_freesv _((SV* sv)); -VIRTUAL void save_freeop _((OP* o)); -VIRTUAL void save_freepv _((char* pv)); -VIRTUAL void save_generic_svref _((SV** sptr)); -VIRTUAL void save_gp _((GV* gv, I32 empty)); -VIRTUAL HV* save_hash _((GV* gv)); -VIRTUAL void save_helem _((HV* hv, SV *key, SV **sptr)); -VIRTUAL void save_hints _((void)); -VIRTUAL void save_hptr _((HV** hptr)); -VIRTUAL void save_I16 _((I16* intp)); -VIRTUAL void save_I32 _((I32* intp)); -VIRTUAL void save_int _((int* intp)); -VIRTUAL void save_item _((SV* item)); -VIRTUAL void save_iv _((IV* iv)); -VIRTUAL void save_list _((SV** sarg, I32 maxsarg)); -VIRTUAL void save_long _((long* longp)); -VIRTUAL void save_nogv _((GV* gv)); -VIRTUAL void save_op _((void)); -VIRTUAL SV* save_scalar _((GV* gv)); -VIRTUAL void save_pptr _((char** pptr)); -VIRTUAL void save_re_context _((void)); -VIRTUAL void save_sptr _((SV** sptr)); -VIRTUAL SV* save_svref _((SV** sptr)); -VIRTUAL SV** save_threadsv _((PADOFFSET i)); -VIRTUAL OP* sawparens _((OP* o)); -VIRTUAL OP* scalar _((OP* o)); -VIRTUAL OP* scalarkids _((OP* o)); -VIRTUAL OP* scalarseq _((OP* o)); -VIRTUAL OP* scalarvoid _((OP* o)); -VIRTUAL UV scan_bin _((char* start, I32 len, I32* retlen)); -VIRTUAL UV scan_hex _((char* start, I32 len, I32* retlen)); -VIRTUAL char* scan_num _((char* s)); -VIRTUAL UV scan_oct _((char* start, I32 len, I32* retlen)); -VIRTUAL OP* scope _((OP* o)); -VIRTUAL char* screaminstr _((SV* bigsv, SV* littlesv, I32 start_shift, I32 end_shift, I32 *state, I32 last)); +VIRTUAL void save_freesv (SV* sv); +VIRTUAL void save_freeop (OP* o); +VIRTUAL void save_freepv (char* pv); +VIRTUAL void save_generic_svref (SV** sptr); +VIRTUAL void save_gp (GV* gv, I32 empty); +VIRTUAL HV* save_hash (GV* gv); +VIRTUAL void save_helem (HV* hv, SV *key, SV **sptr); +VIRTUAL void save_hints (void); +VIRTUAL void save_hptr (HV** hptr); +VIRTUAL void save_I16 (I16* intp); +VIRTUAL void save_I32 (I32* intp); +VIRTUAL void save_int (int* intp); +VIRTUAL void save_item (SV* item); +VIRTUAL void save_iv (IV* iv); +VIRTUAL void save_list (SV** sarg, I32 maxsarg); +VIRTUAL void save_long (long* longp); +VIRTUAL void save_nogv (GV* gv); +VIRTUAL void save_op (void); +VIRTUAL SV* save_scalar (GV* gv); +VIRTUAL void save_pptr (char** pptr); +VIRTUAL void save_re_context (void); +VIRTUAL void save_sptr (SV** sptr); +VIRTUAL SV* save_svref (SV** sptr); +VIRTUAL SV** save_threadsv (PADOFFSET i); +VIRTUAL OP* sawparens (OP* o); +VIRTUAL OP* scalar (OP* o); +VIRTUAL OP* scalarkids (OP* o); +VIRTUAL OP* scalarseq (OP* o); +VIRTUAL OP* scalarvoid (OP* o); +VIRTUAL UV scan_bin (char* start, I32 len, I32* retlen); +VIRTUAL UV scan_hex (char* start, I32 len, I32* retlen); +VIRTUAL char* scan_num (char* s); +VIRTUAL UV scan_oct (char* start, I32 len, I32* retlen); +VIRTUAL OP* scope (OP* o); +VIRTUAL char* screaminstr (SV* bigsv, SV* littlesv, I32 start_shift, I32 end_shift, I32 *state, I32 last); #ifndef VMS -VIRTUAL I32 setenv_getix _((char* nam)); -#endif -VIRTUAL void setdefout _((GV* gv)); -VIRTUAL char* sharepvn _((const char* sv, I32 len, U32 hash)); -VIRTUAL HEK* share_hek _((const char* sv, I32 len, U32 hash)); -VIRTUAL Signal_t sighandler _((int sig)); -VIRTUAL SV** stack_grow _((SV** sp, SV**p, int n)); -VIRTUAL I32 start_subparse _((I32 is_format, U32 flags)); -VIRTUAL void sub_crush_depth _((CV* cv)); -VIRTUAL bool sv_2bool _((SV* sv)); -VIRTUAL CV* sv_2cv _((SV* sv, HV** st, GV** gvp, I32 lref)); -VIRTUAL IO* sv_2io _((SV* sv)); -VIRTUAL IV sv_2iv _((SV* sv)); -VIRTUAL SV* sv_2mortal _((SV* sv)); -VIRTUAL double sv_2nv _((SV* sv)); -VIRTUAL char* sv_2pv _((SV* sv, STRLEN* lp)); -VIRTUAL UV sv_2uv _((SV* sv)); -VIRTUAL IV sv_iv _((SV* sv)); -VIRTUAL UV sv_uv _((SV* sv)); -VIRTUAL double sv_nv _((SV* sv)); -VIRTUAL char * sv_pvn _((SV *sv, STRLEN *len)); -VIRTUAL I32 sv_true _((SV *sv)); -VIRTUAL void sv_add_arena _((char* ptr, U32 size, U32 flags)); -VIRTUAL int sv_backoff _((SV* sv)); -VIRTUAL SV* sv_bless _((SV* sv, HV* stash)); -VIRTUAL void sv_catpvf _((SV* sv, const char* pat, ...)); -VIRTUAL void sv_catpv _((SV* sv, const char* ptr)); -VIRTUAL void sv_catpvn _((SV* sv, const char* ptr, STRLEN len)); -VIRTUAL void sv_catsv _((SV* dsv, SV* ssv)); -VIRTUAL void sv_chop _((SV* sv, char* ptr)); -VIRTUAL void sv_clean_all _((void)); -VIRTUAL void sv_clean_objs _((void)); -VIRTUAL void sv_clear _((SV* sv)); -VIRTUAL I32 sv_cmp _((SV* sv1, SV* sv2)); -VIRTUAL I32 sv_cmp_locale _((SV* sv1, SV* sv2)); +VIRTUAL I32 setenv_getix (char* nam); +#endif +VIRTUAL void setdefout (GV* gv); +VIRTUAL char* sharepvn (const char* sv, I32 len, U32 hash); +VIRTUAL HEK* share_hek (const char* sv, I32 len, U32 hash); +VIRTUAL Signal_t sighandler (int sig); +VIRTUAL SV** stack_grow (SV** sp, SV**p, int n); +VIRTUAL I32 start_subparse (I32 is_format, U32 flags); +VIRTUAL void sub_crush_depth (CV* cv); +VIRTUAL bool sv_2bool (SV* sv); +VIRTUAL CV* sv_2cv (SV* sv, HV** st, GV** gvp, I32 lref); +VIRTUAL IO* sv_2io (SV* sv); +VIRTUAL IV sv_2iv (SV* sv); +VIRTUAL SV* sv_2mortal (SV* sv); +VIRTUAL double sv_2nv (SV* sv); +VIRTUAL char* sv_2pv (SV* sv, STRLEN* lp); +VIRTUAL UV sv_2uv (SV* sv); +VIRTUAL IV sv_iv (SV* sv); +VIRTUAL UV sv_uv (SV* sv); +VIRTUAL double sv_nv (SV* sv); +VIRTUAL char * sv_pvn (SV *sv, STRLEN *len); +VIRTUAL I32 sv_true (SV *sv); +VIRTUAL void sv_add_arena (char* ptr, U32 size, U32 flags); +VIRTUAL int sv_backoff (SV* sv); +VIRTUAL SV* sv_bless (SV* sv, HV* stash); +VIRTUAL void sv_catpvf (SV* sv, const char* pat, ...); +VIRTUAL void sv_catpv (SV* sv, const char* ptr); +VIRTUAL void sv_catpvn (SV* sv, const char* ptr, STRLEN len); +VIRTUAL void sv_catsv (SV* dsv, SV* ssv); +VIRTUAL void sv_chop (SV* sv, char* ptr); +VIRTUAL void sv_clean_all (void); +VIRTUAL void sv_clean_objs (void); +VIRTUAL void sv_clear (SV* sv); +VIRTUAL I32 sv_cmp (SV* sv1, SV* sv2); +VIRTUAL I32 sv_cmp_locale (SV* sv1, SV* sv2); #ifdef USE_LOCALE_COLLATE -VIRTUAL char* sv_collxfrm _((SV* sv, STRLEN* nxp)); -#endif -VIRTUAL OP* sv_compile_2op _((SV* sv, OP** startp, char* code, AV** avp)); -VIRTUAL void sv_dec _((SV* sv)); -VIRTUAL void sv_dump _((SV* sv)); -VIRTUAL bool sv_derived_from _((SV* sv, const char* name)); -VIRTUAL I32 sv_eq _((SV* sv1, SV* sv2)); -VIRTUAL void sv_free _((SV* sv)); -VIRTUAL void sv_free_arenas _((void)); -VIRTUAL char* sv_gets _((SV* sv, PerlIO* fp, I32 append)); -VIRTUAL char* sv_grow _((SV* sv, STRLEN newlen)); -VIRTUAL void sv_inc _((SV* sv)); -VIRTUAL void sv_insert _((SV* bigsv, STRLEN offset, STRLEN len, char* little, STRLEN littlelen)); -VIRTUAL int sv_isa _((SV* sv, const char* name)); -VIRTUAL int sv_isobject _((SV* sv)); -VIRTUAL STRLEN sv_len _((SV* sv)); -VIRTUAL STRLEN sv_len_utf8 _((SV* sv)); -VIRTUAL void sv_magic _((SV* sv, SV* obj, int how, const char* name, I32 namlen)); -VIRTUAL SV* sv_mortalcopy _((SV* oldsv)); -VIRTUAL SV* sv_newmortal _((void)); -VIRTUAL SV* sv_newref _((SV* sv)); -VIRTUAL char* sv_peek _((SV* sv)); -VIRTUAL void sv_pos_u2b _((SV* sv, I32* offsetp, I32* lenp)); -VIRTUAL void sv_pos_b2u _((SV* sv, I32* offsetp)); -VIRTUAL char* sv_pvn_force _((SV* sv, STRLEN* lp)); -VIRTUAL char* sv_reftype _((SV* sv, int ob)); -VIRTUAL void sv_replace _((SV* sv, SV* nsv)); -VIRTUAL void sv_report_used _((void)); -VIRTUAL void sv_reset _((char* s, HV* stash)); -VIRTUAL void sv_setpvf _((SV* sv, const char* pat, ...)); -VIRTUAL void sv_setiv _((SV* sv, IV num)); -VIRTUAL void sv_setpviv _((SV* sv, IV num)); -VIRTUAL void sv_setuv _((SV* sv, UV num)); -VIRTUAL void sv_setnv _((SV* sv, double num)); -VIRTUAL SV* sv_setref_iv _((SV* rv, const char* classname, IV iv)); -VIRTUAL SV* sv_setref_nv _((SV* rv, const char* classname, double nv)); -VIRTUAL SV* sv_setref_pv _((SV* rv, const char* classname, void* pv)); -VIRTUAL SV* sv_setref_pvn _((SV* rv, const char* classname, char* pv, STRLEN n)); -VIRTUAL void sv_setpv _((SV* sv, const char* ptr)); -VIRTUAL void sv_setpvn _((SV* sv, const char* ptr, STRLEN len)); -VIRTUAL void sv_setsv _((SV* dsv, SV* ssv)); -VIRTUAL void sv_taint _((SV* sv)); -VIRTUAL bool sv_tainted _((SV* sv)); -VIRTUAL int sv_unmagic _((SV* sv, int type)); -VIRTUAL void sv_unref _((SV* sv)); -VIRTUAL void sv_untaint _((SV* sv)); -VIRTUAL bool sv_upgrade _((SV* sv, U32 mt)); -VIRTUAL void sv_usepvn _((SV* sv, char* ptr, STRLEN len)); -VIRTUAL void sv_vcatpvfn _((SV* sv, const char* pat, STRLEN patlen, +VIRTUAL char* sv_collxfrm (SV* sv, STRLEN* nxp); +#endif +VIRTUAL OP* sv_compile_2op (SV* sv, OP** startp, char* code, AV** avp); +VIRTUAL void sv_dec (SV* sv); +VIRTUAL void sv_dump (SV* sv); +VIRTUAL bool sv_derived_from (SV* sv, const char* name); +VIRTUAL I32 sv_eq (SV* sv1, SV* sv2); +VIRTUAL void sv_free (SV* sv); +VIRTUAL void sv_free_arenas (void); +VIRTUAL char* sv_gets (SV* sv, PerlIO* fp, I32 append); +VIRTUAL char* sv_grow (SV* sv, STRLEN newlen); +VIRTUAL void sv_inc (SV* sv); +VIRTUAL void sv_insert (SV* bigsv, STRLEN offset, STRLEN len, char* little, STRLEN littlelen); +VIRTUAL int sv_isa (SV* sv, const char* name); +VIRTUAL int sv_isobject (SV* sv); +VIRTUAL STRLEN sv_len (SV* sv); +VIRTUAL STRLEN sv_len_utf8 (SV* sv); +VIRTUAL void sv_magic (SV* sv, SV* obj, int how, const char* name, I32 namlen); +VIRTUAL SV* sv_mortalcopy (SV* oldsv); +VIRTUAL SV* sv_newmortal (void); +VIRTUAL SV* sv_newref (SV* sv); +VIRTUAL char* sv_peek (SV* sv); +VIRTUAL void sv_pos_u2b (SV* sv, I32* offsetp, I32* lenp); +VIRTUAL void sv_pos_b2u (SV* sv, I32* offsetp); +VIRTUAL char* sv_pvn_force (SV* sv, STRLEN* lp); +VIRTUAL char* sv_reftype (SV* sv, int ob); +VIRTUAL void sv_replace (SV* sv, SV* nsv); +VIRTUAL void sv_report_used (void); +VIRTUAL void sv_reset (char* s, HV* stash); +VIRTUAL void sv_setpvf (SV* sv, const char* pat, ...); +VIRTUAL void sv_setiv (SV* sv, IV num); +VIRTUAL void sv_setpviv (SV* sv, IV num); +VIRTUAL void sv_setuv (SV* sv, UV num); +VIRTUAL void sv_setnv (SV* sv, double num); +VIRTUAL SV* sv_setref_iv (SV* rv, const char* classname, IV iv); +VIRTUAL SV* sv_setref_nv (SV* rv, const char* classname, double nv); +VIRTUAL SV* sv_setref_pv (SV* rv, const char* classname, void* pv); +VIRTUAL SV* sv_setref_pvn (SV* rv, const char* classname, char* pv, STRLEN n); +VIRTUAL void sv_setpv (SV* sv, const char* ptr); +VIRTUAL void sv_setpvn (SV* sv, const char* ptr, STRLEN len); +VIRTUAL void sv_setsv (SV* dsv, SV* ssv); +VIRTUAL void sv_taint (SV* sv); +VIRTUAL bool sv_tainted (SV* sv); +VIRTUAL int sv_unmagic (SV* sv, int type); +VIRTUAL void sv_unref (SV* sv); +VIRTUAL void sv_untaint (SV* sv); +VIRTUAL bool sv_upgrade (SV* sv, U32 mt); +VIRTUAL void sv_usepvn (SV* sv, char* ptr, STRLEN len); +VIRTUAL void sv_vcatpvfn (SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, - bool *used_locale)); -VIRTUAL void sv_vsetpvfn _((SV* sv, const char* pat, STRLEN patlen, + bool *used_locale); +VIRTUAL void sv_vsetpvfn (SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, - bool *used_locale)); -VIRTUAL SV* swash_init _((char* pkg, char* name, SV* listsv, I32 minbits, I32 none)); -VIRTUAL UV swash_fetch _((SV *sv, U8 *ptr)); -VIRTUAL void taint_env _((void)); -VIRTUAL void taint_proper _((const char* f, char* s)); -VIRTUAL UV to_utf8_lower _((U8 *p)); -VIRTUAL UV to_utf8_upper _((U8 *p)); -VIRTUAL UV to_utf8_title _((U8 *p)); + bool *used_locale); +VIRTUAL SV* swash_init (char* pkg, char* name, SV* listsv, I32 minbits, I32 none); +VIRTUAL UV swash_fetch (SV *sv, U8 *ptr); +VIRTUAL void taint_env (void); +VIRTUAL void taint_proper (const char* f, char* s); +VIRTUAL UV to_utf8_lower (U8 *p); +VIRTUAL UV to_utf8_upper (U8 *p); +VIRTUAL UV to_utf8_title (U8 *p); #ifdef UNLINK_ALL_VERSIONS -VIRTUAL I32 unlnk _((char* f)); +VIRTUAL I32 unlnk (char* f); #endif #ifdef USE_THREADS -VIRTUAL void unlock_condpair _((void* svv)); -#endif -VIRTUAL void unsharepvn _((const char* sv, I32 len, U32 hash)); -VIRTUAL void unshare_hek _((HEK* hek)); -VIRTUAL void utilize _((int aver, I32 floor, OP* version, OP* id, OP* arg)); -VIRTUAL U8* utf16_to_utf8 _((U16* p, U8 *d, I32 bytelen)); -VIRTUAL U8* utf16_to_utf8_reversed _((U16* p, U8 *d, I32 bytelen)); -VIRTUAL I32 utf8_distance _((U8 *a, U8 *b)); -VIRTUAL U8* utf8_hop _((U8 *s, I32 off)); -VIRTUAL UV utf8_to_uv _((U8 *s, I32* retlen)); -VIRTUAL U8* uv_to_utf8 _((U8 *d, UV uv)); -VIRTUAL void vivify_defelem _((SV* sv)); -VIRTUAL void vivify_ref _((SV* sv, U32 to_what)); -VIRTUAL I32 wait4pid _((int pid, int* statusp, int flags)); -VIRTUAL void warn _((const char* pat,...)); -VIRTUAL void warner _((U32 err, const char* pat,...)); -VIRTUAL void watch _((char** addr)); -VIRTUAL I32 whichsig _((char* sig)); -VIRTUAL int yyerror _((char* s)); +VIRTUAL void unlock_condpair (void* svv); +#endif +VIRTUAL void unsharepvn (const char* sv, I32 len, U32 hash); +VIRTUAL void unshare_hek (HEK* hek); +VIRTUAL void utilize (int aver, I32 floor, OP* version, OP* id, OP* arg); +VIRTUAL U8* utf16_to_utf8 (U16* p, U8 *d, I32 bytelen); +VIRTUAL U8* utf16_to_utf8_reversed (U16* p, U8 *d, I32 bytelen); +VIRTUAL I32 utf8_distance (U8 *a, U8 *b); +VIRTUAL U8* utf8_hop (U8 *s, I32 off); +VIRTUAL UV utf8_to_uv (U8 *s, I32* retlen); +VIRTUAL U8* uv_to_utf8 (U8 *d, UV uv); +VIRTUAL void vivify_defelem (SV* sv); +VIRTUAL void vivify_ref (SV* sv, U32 to_what); +VIRTUAL I32 wait4pid (int pid, int* statusp, int flags); +VIRTUAL void warn (const char* pat,...); +VIRTUAL void warner (U32 err, const char* pat,...); +VIRTUAL void watch (char** addr); +VIRTUAL I32 whichsig (char* sig); +VIRTUAL int yyerror (char* s); #ifdef USE_PURE_BISON # define PERL_YYLEX_PARAM_DECL YYSTYPE *lvalp, int *lcharp #else # define PERL_YYLEX_PARAM_DECL void #endif -VIRTUAL int yylex _((PERL_YYLEX_PARAM_DECL)); -VIRTUAL int yyparse _((void)); -VIRTUAL int yywarn _((char* s)); +VIRTUAL int yylex (PERL_YYLEX_PARAM_DECL); +VIRTUAL int yyparse (void); +VIRTUAL int yywarn (char* s); -VIRTUAL Malloc_t safesysmalloc _((MEM_SIZE nbytes)); -VIRTUAL Malloc_t safesyscalloc _((MEM_SIZE elements, MEM_SIZE size)); -VIRTUAL Malloc_t safesysrealloc _((Malloc_t where, MEM_SIZE nbytes)); -VIRTUAL Free_t safesysfree _((Malloc_t where)); +VIRTUAL Malloc_t safesysmalloc (MEM_SIZE nbytes); +VIRTUAL Malloc_t safesyscalloc (MEM_SIZE elements, MEM_SIZE size); +VIRTUAL Malloc_t safesysrealloc (Malloc_t where, MEM_SIZE nbytes); +VIRTUAL Free_t safesysfree (Malloc_t where); #ifdef LEAKTEST -VIRTUAL Malloc_t safexmalloc _((I32 x, MEM_SIZE size)); -VIRTUAL Malloc_t safexcalloc _((I32 x, MEM_SIZE elements, MEM_SIZE size)); -VIRTUAL Malloc_t safexrealloc _((Malloc_t where, MEM_SIZE size)); -VIRTUAL void safexfree _((Malloc_t where)); +VIRTUAL Malloc_t safexmalloc (I32 x, MEM_SIZE size); +VIRTUAL Malloc_t safexcalloc (I32 x, MEM_SIZE elements, MEM_SIZE size); +VIRTUAL Malloc_t safexrealloc (Malloc_t where, MEM_SIZE size); +VIRTUAL void safexfree (Malloc_t where); #endif #ifdef PERL_GLOBAL_STRUCT -VIRTUAL struct perl_vars *Perl_GetVars _((void)); +VIRTUAL struct perl_vars *Perl_GetVars (void); #endif #ifdef PERL_OBJECT protected: -void hsplit _((HV *hv)); -void hfreeentries _((HV *hv)); -void more_he _((void)); -HE* new_he _((void)); -void del_he _((HE *p)); -HEK *save_hek _((const char *str, I32 len, U32 hash)); -SV *mess_alloc _((void)); -void gv_init_sv _((GV *gv, I32 sv_type)); -SV *save_scalar_at _((SV **sptr)); -IV asIV _((SV* sv)); -UV asUV _((SV* sv)); -SV *more_sv _((void)); -void more_xiv _((void)); -void more_xnv _((void)); -void more_xpv _((void)); -void more_xrv _((void)); -XPVIV *new_xiv _((void)); -XPVNV *new_xnv _((void)); -XPV *new_xpv _((void)); -XRV *new_xrv _((void)); -void del_xiv _((XPVIV* p)); -void del_xnv _((XPVNV* p)); -void del_xpv _((XPV* p)); -void del_xrv _((XRV* p)); -void sv_unglob _((SV* sv)); -I32 avhv_index_sv _((SV* sv)); +void hsplit (HV *hv); +void hfreeentries (HV *hv); +void more_he (void); +HE* new_he (void); +void del_he (HE *p); +HEK *save_hek (const char *str, I32 len, U32 hash); +SV *mess_alloc (void); +void gv_init_sv (GV *gv, I32 sv_type); +SV *save_scalar_at (SV **sptr); +IV asIV (SV* sv); +UV asUV (SV* sv); +SV *more_sv (void); +void more_xiv (void); +void more_xnv (void); +void more_xpv (void); +void more_xrv (void); +XPVIV *new_xiv (void); +XPVNV *new_xnv (void); +XPV *new_xpv (void); +XRV *new_xrv (void); +void del_xiv (XPVIV* p); +void del_xnv (XPVNV* p); +void del_xpv (XPV* p); +void del_xrv (XRV* p); +void sv_unglob (SV* sv); +I32 avhv_index_sv (SV* sv); -void do_report_used _((SV *sv)); -void do_clean_objs _((SV *sv)); -void do_clean_named_objs _((SV *sv)); -void do_clean_all _((SV *sv)); -void not_a_number _((SV *sv)); -void* my_safemalloc _((MEM_SIZE size)); +void do_report_used (SV *sv); +void do_clean_objs (SV *sv); +void do_clean_named_objs (SV *sv); +void do_clean_all (SV *sv); +void not_a_number (SV *sv); +void* my_safemalloc (MEM_SIZE size); -typedef void (CPerlObj::*SVFUNC) _((SV*)); -void visit _((SVFUNC f)); +typedef void (CPerlObj::*SVFUNC) (SV*); +void visit (SVFUNC f); -typedef I32 (CPerlObj::*SVCOMPARE) _((SV*, SV*)); -void qsortsv _((SV ** array, size_t num_elts, SVCOMPARE f)); -I32 sortcv _((SV *a, SV *b)); -void save_magic _((I32 mgs_ix, SV *sv)); -int magic_methpack _((SV *sv, MAGIC *mg, char *meth)); -int magic_methcall _((SV *sv, MAGIC *mg, char *meth, I32 f, int n, SV *val)); -int magic_methcall _((MAGIC *mg, char *meth, I32 flags, int n, SV *val)); -OP * doform _((CV *cv, GV *gv, OP *retop)); -void doencodes _((SV* sv, char* s, I32 len)); -SV* refto _((SV* sv)); -U32 seed _((void)); -OP *docatch _((OP *o)); -void *docatch_body _((va_list args)); -void *perl_parse_body _((va_list args)); -void *perl_run_body _((va_list args)); -void *perl_call_body _((va_list args)); -void perl_call_xbody _((OP *myop, int is_eval)); -void *call_list_body _((va_list args)); -OP *dofindlabel _((OP *o, char *label, OP **opstack, OP **oplimit)); -void doparseform _((SV *sv)); -I32 dopoptoeval _((I32 startingblock)); -I32 dopoptolabel _((char *label)); -I32 dopoptoloop _((I32 startingblock)); -I32 dopoptosub _((I32 startingblock)); -I32 dopoptosub_at _((PERL_CONTEXT* cxstk, I32 startingblock)); -void free_closures _((void)); -void save_lines _((AV *array, SV *sv)); -OP *doeval _((int gimme, OP** startop)); -PerlIO *doopen_pmc _((const char *name, const char *mode)); -I32 sv_ncmp _((SV *a, SV *b)); -I32 sv_i_ncmp _((SV *a, SV *b)); -I32 amagic_ncmp _((SV *a, SV *b)); -I32 amagic_i_ncmp _((SV *a, SV *b)); -I32 amagic_cmp _((SV *str1, SV *str2)); -I32 amagic_cmp_locale _((SV *str1, SV *str2)); +typedef I32 (CPerlObj::*SVCOMPARE) (SV*, SV*); +void qsortsv (SV ** array, size_t num_elts, SVCOMPARE f); +I32 sortcv (SV *a, SV *b); +void save_magic (I32 mgs_ix, SV *sv); +int magic_methpack (SV *sv, MAGIC *mg, char *meth); +int magic_methcall (SV *sv, MAGIC *mg, char *meth, I32 f, int n, SV *val); +int magic_methcall (MAGIC *mg, char *meth, I32 flags, int n, SV *val); +OP * doform (CV *cv, GV *gv, OP *retop); +void doencodes (SV* sv, char* s, I32 len); +SV* refto (SV* sv); +U32 seed (void); +OP *docatch (OP *o); +void *docatch_body (va_list args); +void *perl_parse_body (va_list args); +void *perl_run_body (va_list args); +void *perl_call_body (va_list args); +void perl_call_xbody (OP *myop, int is_eval); +void *call_list_body (va_list args); +OP *dofindlabel (OP *o, char *label, OP **opstack, OP **oplimit); +void doparseform (SV *sv); +I32 dopoptoeval (I32 startingblock); +I32 dopoptolabel (char *label); +I32 dopoptoloop (I32 startingblock); +I32 dopoptosub (I32 startingblock); +I32 dopoptosub_at (PERL_CONTEXT* cxstk, I32 startingblock); +void free_closures (void); +void save_lines (AV *array, SV *sv); +OP *doeval (int gimme, OP** startop); +PerlIO *doopen_pmc (const char *name, const char *mode); +I32 sv_ncmp (SV *a, SV *b); +I32 sv_i_ncmp (SV *a, SV *b); +I32 amagic_ncmp (SV *a, SV *b); +I32 amagic_i_ncmp (SV *a, SV *b); +I32 amagic_cmp (SV *str1, SV *str2); +I32 amagic_cmp_locale (SV *str1, SV *str2); -SV *mul128 _((SV *sv, U8 m)); -SV *is_an_int _((char *s, STRLEN l)); -int div128 _((SV *pnum, bool *done)); +SV *mul128 (SV *sv, U8 m); +SV *is_an_int (char *s, STRLEN l); +int div128 (SV *pnum, bool *done); -int runops_standard _((void)); -int runops_debug _((void)); +int runops_standard (void); +int runops_debug (void); -void check_uni _((void)); -void force_next _((I32 type)); -char *force_version _((char *start)); -char *force_word _((char *start, int token, int check_keyword, int allow_pack, int allow_tick)); -SV *tokeq _((SV *sv)); -char *scan_const _((char *start)); -char *scan_formline _((char *s)); -char *scan_heredoc _((char *s)); -char *scan_ident _((char *s, char *send, char *dest, STRLEN destlen, I32 ck_uni)); -char *scan_inputsymbol _((char *start)); -char *scan_pat _((char *start, I32 type)); -char *scan_str _((char *start)); -char *scan_subst _((char *start)); -char *scan_trans _((char *start)); -char *scan_word _((char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp)); -char *skipspace _((char *s)); -void checkcomma _((char *s, char *name, char *what)); -void force_ident _((char *s, int kind)); -void incline _((char *s)); -int intuit_method _((char *s, GV *gv)); -int intuit_more _((char *s)); -I32 lop _((I32 f, expectation x, char *s)); -void missingterm _((char *s)); -void no_op _((char *what, char *s)); -void set_csh _((void)); -I32 sublex_done _((void)); -I32 sublex_push _((void)); -I32 sublex_start _((void)); +void check_uni (void); +void force_next (I32 type); +char *force_version (char *start); +char *force_word (char *start, int token, int check_keyword, int allow_pack, int allow_tick); +SV *tokeq (SV *sv); +char *scan_const (char *start); +char *scan_formline (char *s); +char *scan_heredoc (char *s); +char *scan_ident (char *s, char *send, char *dest, STRLEN destlen, I32 ck_uni); +char *scan_inputsymbol (char *start); +char *scan_pat (char *start, I32 type); +char *scan_str (char *start); +char *scan_subst (char *start); +char *scan_trans (char *start); +char *scan_word (char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp); +char *skipspace (char *s); +void checkcomma (char *s, char *name, char *what); +void force_ident (char *s, int kind); +void incline (char *s); +int intuit_method (char *s, GV *gv); +int intuit_more (char *s); +I32 lop (I32 f, expectation x, char *s); +void missingterm (char *s); +void no_op (char *what, char *s); +void set_csh (void); +I32 sublex_done (void); +I32 sublex_push (void); +I32 sublex_start (void); #ifdef CRIPPLED_CC -int uni _((I32 f, char *s)); +int uni (I32 f, char *s); #endif -char * filter_gets _((SV *sv, PerlIO *fp, STRLEN append)); -SV *new_constant _((char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type)); -int ao _((int toketype)); -void depcom _((void)); +char * filter_gets (SV *sv, PerlIO *fp, STRLEN append); +SV *new_constant (char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type); +int ao (int toketype); +void depcom (void); #ifdef WIN32 -I32 win32_textfilter _((int idx, SV *sv, int maxlen)); -#endif -char* incl_perldb _((void)); -SV *isa_lookup _((HV *stash, const char *name, int len, int level)); -CV *get_db_sub _((SV **svp, CV *cv)); -I32 list_assignment _((OP *o)); -void bad_type _((I32 n, char *t, char *name, OP *kid)); -OP *modkids _((OP *o, I32 type)); -void no_bareword_allowed _((OP *o)); -OP *no_fh_allowed _((OP *o)); -OP *scalarboolean _((OP *o)); -OP *too_few_arguments _((OP *o, char* name)); -OP *too_many_arguments _((OP *o, char* name)); -void null _((OP* o)); -PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 saweval, U32 flags)); -OP *newDEFSVOP _((void)); -char* gv_ename _((GV *gv)); -CV *cv_clone2 _((CV *proto, CV *outside)); +I32 win32_textfilter (int idx, SV *sv, int maxlen); +#endif +char* incl_perldb (void); +SV *isa_lookup (HV *stash, const char *name, int len, int level); +CV *get_db_sub (SV **svp, CV *cv); +I32 list_assignment (OP *o); +void bad_type (I32 n, char *t, char *name, OP *kid); +OP *modkids (OP *o, I32 type); +void no_bareword_allowed (OP *o); +OP *no_fh_allowed (OP *o); +OP *scalarboolean (OP *o); +OP *too_few_arguments (OP *o, char* name); +OP *too_many_arguments (OP *o, char* name); +void null (OP* o); +PADOFFSET pad_findlex (char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 saweval, U32 flags); +OP *newDEFSVOP (void); +char* gv_ename (GV *gv); +CV *cv_clone2 (CV *proto, CV *outside); -void find_beginning _((void)); -void forbid_setid _((char *)); -void incpush _((char *, int)); -void init_interp _((void)); -void init_ids _((void)); -void init_debugger _((void)); -void init_lexer _((void)); -void init_main_stash _((void)); +void find_beginning (void); +void forbid_setid (char *); +void incpush (char *, int); +void init_interp (void); +void init_ids (void); +void init_debugger (void); +void init_lexer (void); +void init_main_stash (void); #ifdef USE_THREADS -struct perl_thread * init_main_thread _((void)); +struct perl_thread * init_main_thread (void); #endif /* USE_THREADS */ -void init_perllib _((void)); -void init_postdump_symbols _((int, char **, char **)); -void init_predump_symbols _((void)); -void my_exit_jump _((void)) __attribute__((noreturn)); -void nuke_stacks _((void)); -void open_script _((char *, bool, SV *, int *fd)); -void usage _((char *)); -void validate_suid _((char *, char*, int)); -int emulate_eaccess _((const char* path, int mode)); +void init_perllib (void); +void init_postdump_symbols (int, char **, char **); +void init_predump_symbols (void); +void my_exit_jump (void) __attribute__((noreturn)); +void nuke_stacks (void); +void open_script (char *, bool, SV *, int *fd); +void usage (char *); +void validate_suid (char *, char*, int); +int emulate_eaccess (const char* path, int mode); -regnode *reg _((I32, I32 *)); -regnode *reganode _((U8, U32)); -regnode *regatom _((I32 *)); -regnode *regbranch _((I32 *, I32)); -void regc _((U8, char *)); -void reguni _((UV, char *, I32*)); -regnode *regclass _((void)); -regnode *regclassutf8 _((void)); -I32 regcurly _((char *)); -regnode *reg_node _((U8)); -regnode *regpiece _((I32 *)); -void reginsert _((U8, regnode *)); -void regoptail _((regnode *, regnode *)); -void regset _((char *, I32)); -void regtail _((regnode *, regnode *)); -char* regwhite _((char *, char *)); -char* nextchar _((void)); -regnode *dumpuntil _((regnode *start, regnode *node, regnode *last, SV* sv, I32 l)); -void scan_commit _((scan_data_t *data)); -I32 study_chunk _((regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 flags)); -I32 add_data _((I32 n, char *s)); -void re_croak2 _((const char* pat1,const char* pat2,...)) __attribute__((noreturn)); -char* regpposixcc _((I32 value)); -void clear_re _((void *r)); -I32 regmatch _((regnode *prog)); -I32 regrepeat _((regnode *p, I32 max)); -I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp)); -I32 regtry _((regexp *prog, char *startpos)); -bool reginclass _((char *p, I32 c)); -bool reginclassutf8 _((regnode *f, U8* p)); -CHECKPOINT regcppush _((I32 parenfloor)); -char * regcppop _((void)); -char * regcp_set_to _((I32 ss)); -void cache_re _((regexp *prog)); -void restore_pos _((void *arg)); -U8 * reghop _((U8 *pos, I32 off)); -U8 * reghopmaybe _((U8 *pos, I32 off)); -void dump _((char *pat,...)); +regnode *reg (I32, I32 *); +regnode *reganode (U8, U32); +regnode *regatom (I32 *); +regnode *regbranch (I32 *, I32); +void regc (U8, char *); +void reguni (UV, char *, I32*); +regnode *regclass (void); +regnode *regclassutf8 (void); +I32 regcurly (char *); +regnode *reg_node (U8); +regnode *regpiece (I32 *); +void reginsert (U8, regnode *); +void regoptail (regnode *, regnode *); +void regset (char *, I32); +void regtail (regnode *, regnode *); +char* regwhite (char *, char *); +char* nextchar (void); +regnode *dumpuntil (regnode *start, regnode *node, regnode *last, SV* sv, I32 l); +void scan_commit (scan_data_t *data); +I32 study_chunk (regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 flags); +I32 add_data (I32 n, char *s); +void re_croak2 (const char* pat1,const char* pat2,...) __attribute__((noreturn)); +char* regpposixcc (I32 value); +void clear_re (void *r); +I32 regmatch (regnode *prog); +I32 regrepeat (regnode *p, I32 max); +I32 regrepeat_hard (regnode *p, I32 max, I32 *lp); +I32 regtry (regexp *prog, char *startpos); +bool reginclass (char *p, I32 c); +bool reginclassutf8 (regnode *f, U8* p); +CHECKPOINT regcppush (I32 parenfloor); +char * regcppop (void); +char * regcp_set_to (I32 ss); +void cache_re (regexp *prog); +void restore_pos (void *arg); +U8 * reghop (U8 *pos, I32 off); +U8 * reghopmaybe (U8 *pos, I32 off); +void dump (char *pat,...); #ifdef WIN32 -int do_aspawn _((void *vreally, void **vmark, void **vsp)); +int do_aspawn (void *vreally, void **vmark, void **vsp); #endif #ifdef DEBUGGING -void del_sv _((SV *p)); +void del_sv (SV *p); #endif -void debprof _((OP *o)); +void debprof (OP *o); -OP *new_logop _((I32 type, I32 flags, OP **firstp, OP **otherp)); -void simplify_sort _((OP *o)); -bool is_handle_constructor _((OP *o, I32 argnum)); -void sv_add_backref _((SV *tsv, SV *sv)); -void sv_del_backref _((SV *sv)); +OP *new_logop (I32 type, I32 flags, OP **firstp, OP **otherp); +void simplify_sort (OP *o); +bool is_handle_constructor (OP *o, I32 argnum); +void sv_add_backref (SV *tsv, SV *sv); +void sv_del_backref (SV *sv); -I32 do_trans_CC_simple _((SV *sv)); -I32 do_trans_CC_count _((SV *sv)); -I32 do_trans_CC_complex _((SV *sv)); -I32 do_trans_UU_simple _((SV *sv)); -I32 do_trans_UU_count _((SV *sv)); -I32 do_trans_UU_complex _((SV *sv)); -I32 do_trans_UC_simple _((SV *sv)); -I32 do_trans_CU_simple _((SV *sv)); -I32 do_trans_UC_trivial _((SV *sv)); -I32 do_trans_CU_trivial _((SV *sv)); +I32 do_trans_CC_simple (SV *sv); +I32 do_trans_CC_count (SV *sv); +I32 do_trans_CC_complex (SV *sv); +I32 do_trans_UU_simple (SV *sv); +I32 do_trans_UU_count (SV *sv); +I32 do_trans_UU_complex (SV *sv); +I32 do_trans_UC_simple (SV *sv); +I32 do_trans_CU_simple (SV *sv); +I32 do_trans_UC_trivial (SV *sv); +I32 do_trans_CU_trivial (SV *sv); #undef PERL_CKDEF #undef PERL_PPDEF -#define PERL_CKDEF(s) OP* s _((OP *o)); -#define PERL_PPDEF(s) OP* s _((ARGSproto)); +#define PERL_CKDEF(s) OP* s (OP *o); +#define PERL_PPDEF(s) OP* s (ARGSproto); public: #include "pp_proto.h" -void unwind_handler_stack _((void *p)); -void restore_magic _((void *p)); -void restore_rsfp _((void *f)); -void restore_expect _((void *e)); -void restore_lex_expect _((void *e)); -void yydestruct _((void *ptr)); -VIRTUAL int fprintf _((PerlIO *pf, const char *pat, ...)); +void unwind_handler_stack (void *p); +void restore_magic (void *p); +void restore_rsfp (void *f); +void restore_expect (void *e); +void restore_lex_expect (void *e); +void yydestruct (void *ptr); +VIRTUAL int fprintf (PerlIO *pf, const char *pat, ...); #ifdef WIN32 -VIRTUAL int& ErrorNo _((void)); +VIRTUAL int& ErrorNo (void); #endif /* WIN32 */ #else /* !PERL_OBJECT */ END_EXTERN_C #endif /* PERL_OBJECT */ -VIRTUAL void sv_catpvf_mg _((SV *sv, const char* pat, ...)); -VIRTUAL void sv_catpv_mg _((SV *sv, const char *ptr)); -VIRTUAL void sv_catpvn_mg _((SV *sv, const char *ptr, STRLEN len)); -VIRTUAL void sv_catsv_mg _((SV *dstr, SV *sstr)); -VIRTUAL void sv_setpvf_mg _((SV *sv, const char* pat, ...)); -VIRTUAL void sv_setiv_mg _((SV *sv, IV i)); -VIRTUAL void sv_setpviv_mg _((SV *sv, IV iv)); -VIRTUAL void sv_setuv_mg _((SV *sv, UV u)); -VIRTUAL void sv_setnv_mg _((SV *sv, double num)); -VIRTUAL void sv_setpv_mg _((SV *sv, const char *ptr)); -VIRTUAL void sv_setpvn_mg _((SV *sv, const char *ptr, STRLEN len)); -VIRTUAL void sv_setsv_mg _((SV *dstr, SV *sstr)); -VIRTUAL void sv_usepvn_mg _((SV *sv, char *ptr, STRLEN len)); +VIRTUAL void sv_catpvf_mg (SV *sv, const char* pat, ...); +VIRTUAL void sv_catpv_mg (SV *sv, const char *ptr); +VIRTUAL void sv_catpvn_mg (SV *sv, const char *ptr, STRLEN len); +VIRTUAL void sv_catsv_mg (SV *dstr, SV *sstr); +VIRTUAL void sv_setpvf_mg (SV *sv, const char* pat, ...); +VIRTUAL void sv_setiv_mg (SV *sv, IV i); +VIRTUAL void sv_setpviv_mg (SV *sv, IV iv); +VIRTUAL void sv_setuv_mg (SV *sv, UV u); +VIRTUAL void sv_setnv_mg (SV *sv, double num); +VIRTUAL void sv_setpv_mg (SV *sv, const char *ptr); +VIRTUAL void sv_setpvn_mg (SV *sv, const char *ptr, STRLEN len); +VIRTUAL void sv_setsv_mg (SV *dstr, SV *sstr); +VIRTUAL void sv_usepvn_mg (SV *sv, char *ptr, STRLEN len); -VIRTUAL MGVTBL* get_vtbl _((int vtbl_id)); +VIRTUAL MGVTBL* get_vtbl (int vtbl_id); /* New virtual functions must be added here to maintain binary * compatablity with PERL_OBJECT */ -VIRTUAL char* pv_display _((SV *sv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim)); -VIRTUAL void dump_indent _((I32 level, PerlIO *file, const char* pat, ...)); +VIRTUAL char* pv_display (SV *sv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim); +VIRTUAL void dump_indent (I32 level, PerlIO *file, const char* pat, ...); -VIRTUAL void do_gv_dump _((I32 level, PerlIO *file, char *name, GV *sv)); -VIRTUAL void do_gvgv_dump _((I32 level, PerlIO *file, char *name, GV *sv)); -VIRTUAL void do_hv_dump _((I32 level, PerlIO *file, char *name, HV *sv)); -VIRTUAL void do_magic_dump _((I32 level, PerlIO *file, MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim)); -VIRTUAL void do_op_dump _((I32 level, PerlIO *file, OP *o)); -VIRTUAL void do_pmop_dump _((I32 level, PerlIO *file, PMOP *pm)); -VIRTUAL void do_sv_dump _((I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim)); -VIRTUAL void magic_dump _((MAGIC *mg)); -VIRTUAL void* default_protect _((int *excpt, protect_body_t body, ...)); -VIRTUAL void reginitcolors _((void)); -VIRTUAL char* sv_2pv_nolen _((SV* sv)); -VIRTUAL char* sv_pv _((SV *sv)); -VIRTUAL void sv_force_normal _((SV *sv)); -VIRTUAL void tmps_grow _((I32 n)); -VIRTUAL void *bset_obj_store _((void *obj, I32 ix)); +VIRTUAL void do_gv_dump (I32 level, PerlIO *file, char *name, GV *sv); +VIRTUAL void do_gvgv_dump (I32 level, PerlIO *file, char *name, GV *sv); +VIRTUAL void do_hv_dump (I32 level, PerlIO *file, char *name, HV *sv); +VIRTUAL void do_magic_dump (I32 level, PerlIO *file, MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim); +VIRTUAL void do_op_dump (I32 level, PerlIO *file, OP *o); +VIRTUAL void do_pmop_dump (I32 level, PerlIO *file, PMOP *pm); +VIRTUAL void do_sv_dump (I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim); +VIRTUAL void magic_dump (MAGIC *mg); +VIRTUAL void* default_protect (int *excpt, protect_body_t body, ...); +VIRTUAL void reginitcolors (void); +VIRTUAL char* sv_2pv_nolen (SV* sv); +VIRTUAL char* sv_pv (SV *sv); +VIRTUAL void sv_force_normal (SV *sv); +VIRTUAL void tmps_grow (I32 n); +VIRTUAL void *bset_obj_store (void *obj, I32 ix); -VIRTUAL SV* sv_rvweaken _((SV *sv)); -VIRTUAL int magic_killbackrefs _((SV *sv, MAGIC *mg)); +VIRTUAL SV* sv_rvweaken (SV *sv); +VIRTUAL int magic_killbackrefs (SV *sv, MAGIC *mg); diff --git a/regcomp.c b/regcomp.c index a360f6a..50083ee 100644 --- a/regcomp.c +++ b/regcomp.c @@ -129,25 +129,25 @@ */ #ifndef PERL_OBJECT -static regnode *reg _((I32, I32 *)); -static regnode *reganode _((U8, U32)); -static regnode *regatom _((I32 *)); -static regnode *regbranch _((I32 *, I32)); -static void regc _((U8, char *)); -static void reguni _((UV, char *, I32*)); -static regnode *regclass _((void)); -static regnode *regclassutf8 _((void)); -STATIC I32 regcurly _((char *)); -static regnode *reg_node _((U8)); -static regnode *regpiece _((I32 *)); -static void reginsert _((U8, regnode *)); -static void regoptail _((regnode *, regnode *)); -static void regtail _((regnode *, regnode *)); -static char* regwhite _((char *, char *)); -static char* nextchar _((void)); -static void re_croak2 _((const char* pat1,const char* pat2,...)) __attribute__((noreturn)); -static char* regpposixcc _((I32 value)); -static void clear_re _((void *r)); +static regnode *reg (I32, I32 *); +static regnode *reganode (U8, U32); +static regnode *regatom (I32 *); +static regnode *regbranch (I32 *, I32); +static void regc (U8, char *); +static void reguni (UV, char *, I32*); +static regnode *regclass (void); +static regnode *regclassutf8 (void); +STATIC I32 regcurly (char *); +static regnode *reg_node (U8); +static regnode *regpiece (I32 *); +static void reginsert (U8, regnode *); +static void regoptail (regnode *, regnode *); +static void regtail (regnode *, regnode *); +static char* regwhite (char *, char *); +static char* nextchar (void); +static void re_croak2 (const char* pat1,const char* pat2,...) __attribute__((noreturn)); +static char* regpposixcc (I32 value); +static void clear_re (void *r); #endif /* Length of a variant. */ diff --git a/regexec.c b/regexec.c index 5806767..a61c88a 100644 --- a/regexec.c +++ b/regexec.c @@ -98,18 +98,18 @@ typedef I32 CHECKPOINT; * Forwards. */ -static I32 regmatch _((regnode *prog)); -static I32 regrepeat _((regnode *p, I32 max)); -static I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp)); -static I32 regtry _((regexp *prog, char *startpos)); - -static bool reginclass _((char *p, I32 c)); -static bool reginclassutf8 _((regnode *f, U8* p)); -static CHECKPOINT regcppush _((I32 parenfloor)); -static char * regcppop _((void)); -static char * regcp_set_to _((I32 ss)); -static void cache_re _((regexp *prog)); -static void restore_pos _((void *arg)); +static I32 regmatch (regnode *prog); +static I32 regrepeat (regnode *p, I32 max); +static I32 regrepeat_hard (regnode *p, I32 max, I32 *lp); +static I32 regtry (regexp *prog, char *startpos); + +static bool reginclass (char *p, I32 c); +static bool reginclassutf8 (regnode *f, U8* p); +static CHECKPOINT regcppush (I32 parenfloor); +static char * regcppop (void); +static char * regcp_set_to (I32 ss); +static void cache_re (regexp *prog); +static void restore_pos (void *arg); #endif #define REGINCLASS(p,c) (*(p) ? reginclass(p,c) : ANYOF_TEST(p,c)) @@ -119,8 +119,8 @@ static void restore_pos _((void *arg)); #define CHR_DIST(a,b) (UTF ? utf8_distance(a,b) : a - b) #ifndef PERL_OBJECT -static U8 * reghop _((U8 *pos, I32 off)); -static U8 * reghopmaybe _((U8 *pos, I32 off)); +static U8 * reghop (U8 *pos, I32 off); +static U8 * reghopmaybe (U8 *pos, I32 off); #endif #define reghop_c(pos,off) ((char*)reghop((U8*)pos, off)) #define reghopmaybe_c(pos,off) ((char*)reghopmaybe((U8*)pos, off)) diff --git a/run.c b/run.c index b46df8f..514cd16 100644 --- a/run.c +++ b/run.c @@ -35,7 +35,7 @@ runops_standard(void) #ifdef DEBUGGING #ifndef PERL_OBJECT -static void debprof _((OP*o)); +static void debprof (OP*o); #endif #endif /* DEBUGGING */ diff --git a/scope.h b/scope.h index 8358c54..340ca99 100644 --- a/scope.h +++ b/scope.h @@ -89,7 +89,7 @@ #else #define CALLDESTRUCTOR *SSPOPDPTR #define SAVEDESTRUCTOR(f,p) \ - save_destructor(SOFT_CAST(void(*)_((void*)))(FUNC_NAME_TO_PTR(f)), \ + save_destructor(SOFT_CAST(void(*)(void*))(FUNC_NAME_TO_PTR(f)), \ SOFT_CAST(void*)(p)) #endif @@ -159,8 +159,8 @@ typedef struct jmpenv JMPENV; * Function that catches/throws, and its callback for the * body of protected processing. */ -typedef void *(CPERLscope(*protect_body_t)) _((va_list)); -typedef void *(CPERLscope(*protect_proc_t)) _((int *, protect_body_t, ...)); +typedef void *(CPERLscope(*protect_body_t)) (va_list); +typedef void *(CPERLscope(*protect_proc_t)) (int *, protect_body_t, ...); /* * How to build the first jmpenv. diff --git a/sv.c b/sv.c index 9cec787..042ffcc 100644 --- a/sv.c +++ b/sv.c @@ -42,30 +42,30 @@ #else /* !PERL_OBJECT */ -static IV asIV _((SV* sv)); -static UV asUV _((SV* sv)); -static SV *more_sv _((void)); -static void more_xiv _((void)); -static void more_xnv _((void)); -static void more_xpv _((void)); -static void more_xrv _((void)); -static XPVIV *new_xiv _((void)); -static XPVNV *new_xnv _((void)); -static XPV *new_xpv _((void)); -static XRV *new_xrv _((void)); -static void del_xiv _((XPVIV* p)); -static void del_xnv _((XPVNV* p)); -static void del_xpv _((XPV* p)); -static void del_xrv _((XRV* p)); -static void sv_unglob _((SV* sv)); -static void sv_add_backref _((SV *tsv, SV *sv)); -static void sv_del_backref _((SV *sv)); +static IV asIV (SV* sv); +static UV asUV (SV* sv); +static SV *more_sv (void); +static void more_xiv (void); +static void more_xnv (void); +static void more_xpv (void); +static void more_xrv (void); +static XPVIV *new_xiv (void); +static XPVNV *new_xnv (void); +static XPV *new_xpv (void); +static XRV *new_xrv (void); +static void del_xiv (XPVIV* p); +static void del_xnv (XPVNV* p); +static void del_xpv (XPV* p); +static void del_xrv (XRV* p); +static void sv_unglob (SV* sv); +static void sv_add_backref (SV *tsv, SV *sv); +static void sv_del_backref (SV *sv); #ifndef PURIFY static void *my_safemalloc(MEM_SIZE size); #endif -typedef void (*SVFUNC) _((SV*)); +typedef void (*SVFUNC) (SV*); #define VTBL *vtbl #define FCALL *f diff --git a/sv.h b/sv.h index cc8c6bc..0476a12 100644 --- a/sv.h +++ b/sv.h @@ -271,7 +271,7 @@ struct xpvfm { HV * xcv_stash; OP * xcv_start; OP * xcv_root; - void (*xcv_xsub)_((CV* _CPERLproto)); + void (*xcv_xsub)(CV* _CPERLproto); ANY xcv_xsubany; GV * xcv_gv; GV * xcv_filegv; diff --git a/thread.h b/thread.h index 882158c..5c8205e 100644 --- a/thread.h +++ b/thread.h @@ -12,7 +12,7 @@ } \ } STMT_END # define THR getTHR() -struct perl_thread *getTHR _((void)); +struct perl_thread *getTHR (void); # define PTHREAD_GETSPECIFIC_INT # ifdef DJGPP # define pthread_addr_t any_t diff --git a/toke.c b/toke.c index bde8092..46b8c6e 100644 --- a/toke.c +++ b/toke.c @@ -18,44 +18,44 @@ #define yylval PL_yylval #ifndef PERL_OBJECT -static void check_uni _((void)); -static void force_next _((I32 type)); -static char *force_version _((char *start)); -static char *force_word _((char *start, int token, int check_keyword, int allow_pack, int allow_tick)); -static SV *tokeq _((SV *sv)); -static char *scan_const _((char *start)); -static char *scan_formline _((char *s)); -static char *scan_heredoc _((char *s)); -static char *scan_ident _((char *s, char *send, char *dest, STRLEN destlen, - I32 ck_uni)); -static char *scan_inputsymbol _((char *start)); -static char *scan_pat _((char *start, I32 type)); -static char *scan_str _((char *start)); -static char *scan_subst _((char *start)); -static char *scan_trans _((char *start)); -static char *scan_word _((char *s, char *dest, STRLEN destlen, - int allow_package, STRLEN *slp)); -static char *skipspace _((char *s)); -static void checkcomma _((char *s, char *name, char *what)); -static void force_ident _((char *s, int kind)); -static void incline _((char *s)); -static int intuit_method _((char *s, GV *gv)); -static int intuit_more _((char *s)); -static I32 lop _((I32 f, expectation x, char *s)); -static void missingterm _((char *s)); -static void no_op _((char *what, char *s)); -static void set_csh _((void)); -static I32 sublex_done _((void)); -static I32 sublex_push _((void)); -static I32 sublex_start _((void)); +static void check_uni (void); +static void force_next (I32 type); +static char *force_version (char *start); +static char *force_word (char *start, int token, int check_keyword, int allow_pack, int allow_tick); +static SV *tokeq (SV *sv); +static char *scan_const (char *start); +static char *scan_formline (char *s); +static char *scan_heredoc (char *s); +static char *scan_ident (char *s, char *send, char *dest, STRLEN destlen, + I32 ck_uni); +static char *scan_inputsymbol (char *start); +static char *scan_pat (char *start, I32 type); +static char *scan_str (char *start); +static char *scan_subst (char *start); +static char *scan_trans (char *start); +static char *scan_word (char *s, char *dest, STRLEN destlen, + int allow_package, STRLEN *slp); +static char *skipspace (char *s); +static void checkcomma (char *s, char *name, char *what); +static void force_ident (char *s, int kind); +static void incline (char *s); +static int intuit_method (char *s, GV *gv); +static int intuit_more (char *s); +static I32 lop (I32 f, expectation x, char *s); +static void missingterm (char *s); +static void no_op (char *what, char *s); +static void set_csh (void); +static I32 sublex_done (void); +static I32 sublex_push (void); +static I32 sublex_start (void); #ifdef CRIPPLED_CC -static int uni _((I32 f, char *s)); +static int uni (I32 f, char *s); #endif -static char * filter_gets _((SV *sv, PerlIO *fp, STRLEN append)); -static void restore_rsfp _((void *f)); -static SV *new_constant _((char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type)); -static void restore_expect _((void *e)); -static void restore_lex_expect _((void *e)); +static char * filter_gets (SV *sv, PerlIO *fp, STRLEN append); +static void restore_rsfp (void *f); +static SV *new_constant (char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type); +static void restore_expect (void *e); +static void restore_lex_expect (void *e); #endif /* PERL_OBJECT */ static char ident_too_long[] = "Identifier too long"; diff --git a/util.c b/util.c index 24f857e..d48c1dd 100644 --- a/util.c +++ b/util.c @@ -54,7 +54,7 @@ #ifdef LEAKTEST -static void xstat _((int)); +static void xstat (int); long xcount[MAXXCOUNT]; long lastxcount[MAXXCOUNT]; long xycount[MAXXCOUNT][MAXYCOUNT]; @@ -2978,7 +2978,7 @@ perl_cond_wait(perl_cond *cp) #ifdef PTHREAD_GETSPECIFIC_INT struct perl_thread * -getTHR _((void)) +getTHR(void) { pthread_addr_t t; diff --git a/vms/sockadapt.h b/vms/sockadapt.h index e641b4d..0ff309a 100644 --- a/vms/sockadapt.h +++ b/vms/sockadapt.h @@ -182,7 +182,7 @@ int si_fileno(FILE *); # undef getpeername #endif #define getpeername my_getpeername -int my_getpeername _((int, struct sockaddr *, int *)); +int my_getpeername (int, struct sockaddr *, int *); #endif /* SOCKETSHR stuff */ #endif /* include guard */ diff --git a/vms/vmsish.h b/vms/vmsish.h index 5398bcc..06ad647 100644 --- a/vms/vmsish.h +++ b/vms/vmsish.h @@ -552,7 +552,7 @@ typedef unsigned myino_t; * In order to keep Gen_ShrFls.Pl happy, functions which are to be made * available to images linked to PerlShr.Exe must be declared between the * __VMS_PROTOTYPES__ and __VMS_SEPYTOTORP__ lines, and must be in the form - * name_(()); + * name(); */ #ifdef NO_PERL_TYPEDEFS @@ -574,71 +574,71 @@ typedef unsigned myino_t; # endif #endif -void prime_env_iter _((void)); -void init_os_extras _(()); +void prime_env_iter (void); +void init_os_extras (); /* prototype section start marker; `typedef' passes through cpp */ typedef char __VMS_PROTOTYPES__; -int vmstrnenv _((const char *, char *, unsigned long int, struct dsc$descriptor_s **, unsigned long int)); -int my_trnlnm _((const char *, char *, unsigned long int)); -char * my_getenv _((const char *, bool)); -char * my_getenv_len _((const char *, unsigned long *, bool)); -int vmssetenv _((char *, char *, struct dsc$descriptor_s **)); -char * my_crypt _((const char *, const char *)); -Pid_t my_waitpid _((Pid_t, int *, int)); -char * my_gconvert _((double, int, int, char *)); -int do_rmdir _((char *)); -int kill_file _((char *)); -int my_mkdir _((char *, Mode_t)); -int my_utime _((char *, struct utimbuf *)); -char * rmsexpand _((char *, char *, char *, unsigned)); -char * rmsexpand_ts _((char *, char *, char *, unsigned)); -char * fileify_dirspec _((char *, char *)); -char * fileify_dirspec_ts _((char *, char *)); -char * pathify_dirspec _((char *, char *)); -char * pathify_dirspec_ts _((char *, char *)); -char * tounixspec _((char *, char *)); -char * tounixspec_ts _((char *, char *)); -char * tovmsspec _((char *, char *)); -char * tovmsspec_ts _((char *, char *)); -char * tounixpath _((char *, char *)); -char * tounixpath_ts _((char *, char *)); -char * tovmspath _((char *, char *)); -char * tovmspath_ts _((char *, char *)); -void vms_image_init _((int *, char ***)); -DIR * opendir _((char *)); -struct dirent * readdir _((DIR *)); -long telldir _((DIR *)); -void seekdir _((DIR *, long)); -void closedir _((DIR *)); -void vmsreaddirversions _((DIR *, int)); -struct tm * my_gmtime _((const time_t *)); -struct tm * my_localtime _((const time_t *)); -time_t my_time _((time_t *)); +int vmstrnenv (const char *, char *, unsigned long int, struct dsc$descriptor_s **, unsigned long int); +int my_trnlnm (const char *, char *, unsigned long int); +char * my_getenv (const char *, bool); +char * my_getenv_len (const char *, unsigned long *, bool); +int vmssetenv (char *, char *, struct dsc$descriptor_s **); +char * my_crypt (const char *, const char *); +Pid_t my_waitpid (Pid_t, int *, int); +char * my_gconvert (double, int, int, char *); +int do_rmdir (char *); +int kill_file (char *); +int my_mkdir (char *, Mode_t); +int my_utime (char *, struct utimbuf *); +char * rmsexpand (char *, char *, char *, unsigned); +char * rmsexpand_ts (char *, char *, char *, unsigned); +char * fileify_dirspec (char *, char *); +char * fileify_dirspec_ts (char *, char *); +char * pathify_dirspec (char *, char *); +char * pathify_dirspec_ts (char *, char *); +char * tounixspec (char *, char *); +char * tounixspec_ts (char *, char *); +char * tovmsspec (char *, char *); +char * tovmsspec_ts (char *, char *); +char * tounixpath (char *, char *); +char * tounixpath_ts (char *, char *); +char * tovmspath (char *, char *); +char * tovmspath_ts (char *, char *); +void vms_image_init (int *, char ***); +DIR * opendir (char *); +struct dirent * readdir (DIR *); +long telldir (DIR *); +void seekdir (DIR *, long); +void closedir (DIR *); +void vmsreaddirversions (DIR *, int); +struct tm * my_gmtime (const time_t *); +struct tm * my_localtime (const time_t *); +time_t my_time (time_t *); #ifdef HOMEGROWN_POSIX_SIGNALS -int my_sigemptyset _((sigset_t *)); -int my_sigfillset _((sigset_t *)); -int my_sigaddset _((sigset_t *, int)); -int my_sigdelset _((sigset_t *, int)); -int my_sigismember _((sigset_t *, int)); -int my_sigprocmask _((int, sigset_t *, sigset_t *)); +int my_sigemptyset (sigset_t *); +int my_sigfillset (sigset_t *); +int my_sigaddset (sigset_t *, int); +int my_sigdelset (sigset_t *, int); +int my_sigismember (sigset_t *, int); +int my_sigprocmask (int, sigset_t *, sigset_t *); #endif -I32 cando_by_name _((I32, I32, char *)); -int flex_fstat _((int, Stat_t *)); -int flex_stat _((char *, Stat_t *)); -int trim_unixpath _((char *, char*, int)); -int my_vfork _(()); -bool vms_do_aexec _((SV *, SV **, SV **)); -bool vms_do_exec _((char *)); -unsigned long int do_aspawn _((void *, void **, void **)); -unsigned long int do_spawn _((char *)); -int my_fwrite _((void *, size_t, size_t, FILE *)); -int my_flush _((FILE *)); -struct passwd * my_getpwnam _((char *name)); -struct passwd * my_getpwuid _((Uid_t uid)); -struct passwd * my_getpwent _(()); -void my_endpwent _(()); -char * my_getlogin _(()); -int rmscopy _((char *, char *, int)); +I32 cando_by_name (I32, I32, char *); +int flex_fstat (int, Stat_t *); +int flex_stat (char *, Stat_t *); +int trim_unixpath (char *, char*, int); +int my_vfork (); +bool vms_do_aexec (SV *, SV **, SV **); +bool vms_do_exec (char *); +unsigned long int do_aspawn (void *, void **, void **); +unsigned long int do_spawn (char *); +int my_fwrite (void *, size_t, size_t, FILE *); +int my_flush (FILE *); +struct passwd * my_getpwnam (char *name); +struct passwd * my_getpwuid (Uid_t uid); +struct passwd * my_getpwent (); +void my_endpwent (); +char * my_getlogin (); +int rmscopy (char *, char *, int); typedef char __VMS_SEPYTOTORP__; /* prototype section end marker; `typedef' passes through cpp */ diff --git a/vms/writemain.pl b/vms/writemain.pl index 6309107..b08bf1d 100644 --- a/vms/writemain.pl +++ b/vms/writemain.pl @@ -50,7 +50,7 @@ if (@exts) { foreach $ext (@exts) { my($subname) = $ext; $subname =~ s/::/__/g; - print OUT "extern void boot_${subname} _((CV* cv));\n" + print OUT "extern void boot_${subname} (CV* cv);\n" } # May not actually be a declaration, so put after other declarations print OUT " dXSUB_SYS;\n"; diff --git a/vos/config.h b/vos/config.h index bed1a98..d12893a 100644 --- a/vos/config.h +++ b/vos/config.h @@ -618,7 +618,7 @@ /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig index 819be2b..eb3a8b6 100755 --- a/vos/config_h.SH_orig +++ b/vos/config_h.SH_orig @@ -696,7 +696,7 @@ sed <config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl index 82e0b32..60d199d 100644 --- a/win32/GenCAPI.pl +++ b/win32/GenCAPI.pl @@ -119,8 +119,8 @@ while () { } $_ =~ s/^VIRTUAL\s*//; $_ =~ s/\s*__attribute__.*$/;/; - if ( /(.*)\s([A-z_]*[0-9A-z_]+\s)_\(\((.*)\)\);/ || - /(.*)\*([A-z_]*[0-9A-z_]+\s)_\(\((.*)\)\);/ ) { + if ( /(.*)\s([A-z_]*[0-9A-z_]+\s)\((.*)\);/ || + /(.*)\*([A-z_]*[0-9A-z_]+\s)\((.*)\);/ ) { $type = $1; $name = $2; $args = $3; diff --git a/win32/config_H.bc b/win32/config_H.bc index ced050c..611e031 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -577,7 +577,7 @@ /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ @@ -2149,7 +2149,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the telldir() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern long telldir _((DIR*)); + * extern long telldir (DIR*); */ #define HAS_TELLDIR_PROTO /**/ @@ -2488,7 +2488,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the drand48() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern double drand48 _((void)); + * extern double drand48 (void); */ /*#define HAS_DRAND48_PROTO /**/ diff --git a/win32/config_H.gc b/win32/config_H.gc index 5aa0c6b..efae62f 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -577,7 +577,7 @@ /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ @@ -2149,7 +2149,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the telldir() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern long telldir _((DIR*)); + * extern long telldir (DIR*); */ #define HAS_TELLDIR_PROTO /**/ @@ -2488,7 +2488,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the drand48() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern double drand48 _((void)); + * extern double drand48 (void); */ /*#define HAS_DRAND48_PROTO /**/ diff --git a/win32/config_H.vc b/win32/config_H.vc index cf7eab9..620afde 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -577,7 +577,7 @@ /* HAS_SHMAT_PROTOTYPE: * This symbol, if defined, indicates that the sys/shm.h includes * a prototype for shmat(). Otherwise, it is up to the program to - * guess one. Shmat_t shmat _((int, Shmat_t, int)) is a good guess, + * guess one. Shmat_t shmat (int, Shmat_t, int) is a good guess, * but not always right so it should be emitted by the program only * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. */ @@ -2149,7 +2149,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the telldir() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern long telldir _((DIR*)); + * extern long telldir (DIR*); */ #define HAS_TELLDIR_PROTO /**/ @@ -2488,7 +2488,7 @@ * This symbol, if defined, indicates that the system provides * a prototype for the drand48() function. Otherwise, it is up * to the program to supply one. A good guess is - * extern double drand48 _((void)); + * extern double drand48 (void); */ /*#define HAS_DRAND48_PROTO /**/ diff --git a/win32/makemain.pl b/win32/makemain.pl index 740b6a2..b230f58 100644 --- a/win32/makemain.pl +++ b/win32/makemain.pl @@ -19,7 +19,7 @@ print "\tNULL,\n"; print "\t};\n"; print "\n"; foreach (@ARGV) { - print "EXTERN_C void boot_$_ _((CV* cv));\n" + print "EXTERN_C void boot_$_ (CV* cv);\n" } print < #else - Malloc_t malloc _((MEM_SIZE nbytes)); - Malloc_t calloc _((MEM_SIZE elements, MEM_SIZE size)); - Malloc_t realloc _((Malloc_t where, MEM_SIZE nbytes)); - Free_t free _((Malloc_t where)); + Malloc_t malloc (MEM_SIZE nbytes); + Malloc_t calloc (MEM_SIZE elements, MEM_SIZE size); + Malloc_t realloc (Malloc_t where, MEM_SIZE nbytes); + Free_t free (Malloc_t where); #endif #if defined(I_STRING) || defined(__cplusplus) @@ -379,27 +379,27 @@ EXT STR *Str; #define GROWSTR(pp,lp,len) if (*(lp) < (len)) growstr(pp,lp,len) /* Prototypes for things in a2p.c */ -int aryrefarg _(( int arg )); -int bl _(( int arg, int maybe )); -void dump _(( int branch )); -int fixfargs _(( int name, int arg, int prevargs )); -int fixrargs _(( char *name, int arg, int prevargs )); -void fixup _(( STR *str )); -int numary _(( int arg )); -int oper0 _(( int type )); -int oper1 _(( int type, int arg1 )); -int oper2 _(( int type, int arg1, int arg2 )); -int oper3 _(( int type, int arg1, int arg2, int arg3 )); -int oper4 _(( int type, int arg1, int arg2, int arg3, int arg4 )); -int oper5 _(( int type, int arg1, int arg2, int arg3, int arg4, int arg5 )); -void putlines _(( STR *str )); -void putone _(( void )); -int rememberargs _(( int arg )); -char * scannum _(( char *s )); -char * scanpat _(( char *s )); -int string _(( char *ptr, int len )); -void yyerror _(( char *s )); -int yylex _(( void )); +int aryrefarg ( int arg ); +int bl ( int arg, int maybe ); +void dump ( int branch ); +int fixfargs ( int name, int arg, int prevargs ); +int fixrargs ( char *name, int arg, int prevargs ); +void fixup ( STR *str ); +int numary ( int arg ); +int oper0 ( int type ); +int oper1 ( int type, int arg1 ); +int oper2 ( int type, int arg1, int arg2 ); +int oper3 ( int type, int arg1, int arg2, int arg3 ); +int oper4 ( int type, int arg1, int arg2, int arg3, int arg4 ); +int oper5 ( int type, int arg1, int arg2, int arg3, int arg4, int arg5 ); +void putlines ( STR *str ); +void putone ( void ); +int rememberargs ( int arg ); +char * scannum ( char *s ); +char * scanpat ( char *s ); +int string ( char *ptr, int len ); +void yyerror ( char *s ); +int yylex ( void ); EXT int line INIT(0); diff --git a/x2p/a2p.y b/x2p/a2p.y index 3bb4e09..da9b628 100644 --- a/x2p/a2p.y +++ b/x2p/a2p.y @@ -399,6 +399,6 @@ compound %% -int yyparse _((void)); +int yyparse (void); #include "a2py.c" diff --git a/x2p/hash.h b/x2p/hash.h index 9dc64a1..377bfd2 100644 --- a/x2p/hash.h +++ b/x2p/hash.h @@ -41,12 +41,12 @@ struct htbl { HENT *tbl_eiter; /* current entry of iterator */ }; -bool hdelete _((HASH *tb, char *key)); -STR * hfetch _(( HASH *tb, char *key )); -int hiterinit _(( HASH *tb )); -char * hiterkey _(( HENT *entry )); -HENT * hiternext _(( HASH *tb )); -STR * hiterval _(( HENT *entry )); -HASH * hnew _(( void )); -void hsplit _(( HASH *tb )); -bool hstore _(( HASH *tb, char *key, STR *val )); +bool hdelete (HASH *tb, char *key); +STR * hfetch ( HASH *tb, char *key ); +int hiterinit ( HASH *tb ); +char * hiterkey ( HENT *entry ); +HENT * hiternext ( HASH *tb ); +STR * hiterval ( HENT *entry ); +HASH * hnew ( void ); +void hsplit ( HASH *tb ); +bool hstore ( HASH *tb, char *key, STR *val ); diff --git a/x2p/str.h b/x2p/str.h index 3deaaec..a7eec88 100644 --- a/x2p/str.h +++ b/x2p/str.h @@ -29,25 +29,25 @@ struct string { EXT STR **tmps_list; EXT long tmps_max INIT(-1); -double str_2num _(( STR *str )); -char * str_2ptr _(( STR *str )); -char * str_append_till _(( STR *str, char *from, int delim, char *keeplist )); -void str_cat _(( STR *str, char *ptr )); -void str_chop _(( STR *str, char *ptr )); -void str_dec _(( STR *str )); -void str_free _(( STR *str )); -char * str_gets _(( STR *str, FILE *fp )); -void str_grow _(( STR *str, int len )); -void str_inc _(( STR *str )); -int str_len _(( STR *str )); -STR * str_make _(( char *s )); -STR * str_mortal _(( STR *oldstr )); -void str_ncat _(( STR *str, char *ptr, int len )); -STR * str_new _(( int len )); -STR * str_nmake _(( double n )); -void str_nset _(( STR *str, char *ptr, int len )); -void str_numset _(( STR *str, double num )); -void str_replace _(( STR *str, STR *nstr )); -void str_scat _(( STR *dstr, STR *sstr )); -void str_set _(( STR *str, char *ptr )); -void str_sset _(( STR *dstr, STR *sstr )); +double str_2num ( STR *str ); +char * str_2ptr ( STR *str ); +char * str_append_till ( STR *str, char *from, int delim, char *keeplist ); +void str_cat ( STR *str, char *ptr ); +void str_chop ( STR *str, char *ptr ); +void str_dec ( STR *str ); +void str_free ( STR *str ); +char * str_gets ( STR *str, FILE *fp ); +void str_grow ( STR *str, int len ); +void str_inc ( STR *str ); +int str_len ( STR *str ); +STR * str_make ( char *s ); +STR * str_mortal ( STR *oldstr ); +void str_ncat ( STR *str, char *ptr, int len ); +STR * str_new ( int len ); +STR * str_nmake ( double n ); +void str_nset ( STR *str, char *ptr, int len ); +void str_numset ( STR *str, double num ); +void str_replace ( STR *str, STR *nstr ); +void str_scat ( STR *dstr, STR *sstr ); +void str_set ( STR *str, char *ptr ); +void str_sset ( STR *dstr, STR *sstr ); diff --git a/x2p/util.h b/x2p/util.h index aa31bea..34138c7 100644 --- a/x2p/util.h +++ b/x2p/util.h @@ -22,18 +22,18 @@ char *getwd(); int makedir(); -char * cpy2 _(( char *to, char *from, int delim )); -char * cpytill _(( char *to, char *from, int delim )); -void growstr _(( char **strptr, int *curlen, int newlen )); -char * instr _(( char *big, char *little )); -char * safecpy _(( char *to, char *from, int len )); -char * savestr _(( char *str )); -void croak _(( char *pat, ... )); -void fatal _(( char *pat, ... )); -void warn _(( char *pat, ... )); -int prewalk _(( int numit, int level, int node, int *numericptr )); +char * cpy2 ( char *to, char *from, int delim ); +char * cpytill ( char *to, char *from, int delim ); +void growstr ( char **strptr, int *curlen, int newlen ); +char * instr ( char *big, char *little ); +char * safecpy ( char *to, char *from, int len ); +char * savestr ( char *str ); +void croak ( char *pat, ... ); +void fatal ( char *pat, ... ); +void warn ( char *pat, ... ); +int prewalk ( int numit, int level, int node, int *numericptr ); -Malloc_t safemalloc _((MEM_SIZE nbytes)); -Malloc_t safecalloc _((MEM_SIZE elements, MEM_SIZE size)); -Malloc_t saferealloc _((Malloc_t where, MEM_SIZE nbytes)); -Free_t safefree _((Malloc_t where)); +Malloc_t safemalloc (MEM_SIZE nbytes); +Malloc_t safecalloc (MEM_SIZE elements, MEM_SIZE size); +Malloc_t saferealloc (Malloc_t where, MEM_SIZE nbytes); +Free_t safefree (Malloc_t where); diff --git a/x2p/walk.c b/x2p/walk.c index ab76fbe..34361ab 100644 --- a/x2p/walk.c +++ b/x2p/walk.c @@ -26,14 +26,14 @@ char *limit; STR *subs; STR *curargs = Nullstr; -static void addsemi _(( STR *str )); -static void emit_split _(( STR *str, int level )); -static void fixtab _(( STR *str, int lvl )); -static void numericize _(( int node )); -static void tab _(( STR *str, int lvl )); +static void addsemi ( STR *str ); +static void emit_split ( STR *str, int level ); +static void fixtab ( STR *str, int lvl ); +static void numericize ( int node ); +static void tab ( STR *str, int lvl ); -int prewalk _(( int numit, int level, int node, int *numericptr )); -STR * walk _(( int useval, int level, int node, int *numericptr, int minprec )); +int prewalk ( int numit, int level, int node, int *numericptr ); +STR * walk ( int useval, int level, int node, int *numericptr, int minprec ); STR *