Change 27977 by [EMAIL PROTECTED] on 2006/04/27 14:19:31
Fix up my mistakes with prototypes made while merging pack changes.
Prototypes for non-static functions are now restored to 5.8.8.
Affected files ...
... //depot/maint-5.8/perl/mathoms.c#12 edit
... //depot/maint-5.8/perl/pp_pack.c#39 edit
... //depot/maint-5.8/perl/proto.h#128 edit
Differences ...
==== //depot/maint-5.8/perl/mathoms.c#12 (text) ====
Index: perl/mathoms.c
--- perl/mathoms.c#11~27974~ 2006-04-27 04:41:22.000000000 -0700
+++ perl/mathoms.c 2006-04-27 07:19:31.000000000 -0700
@@ -1197,9 +1197,8 @@
=cut */
I32
-Perl_unpack_str(pTHX_ const char *pat, const char *patend, const char *s,
- const char *strbeg, const char *strend, char **new_s, I32 ocnt,
- U32 flags)
+Perl_unpack_str(pTHX_ char *pat, char *patend, char *s, char *strbeg,
+ char *strend, char **new_s, I32 ocnt, U32 flags)
{
PERL_UNUSED_ARG(strbeg);
PERL_UNUSED_ARG(new_s);
==== //depot/maint-5.8/perl/pp_pack.c#39 (text) ====
Index: perl/pp_pack.c
--- perl/pp_pack.c#38~27974~ 2006-04-27 04:41:22.000000000 -0700
+++ perl/pp_pack.c 2006-04-27 07:19:31.000000000 -0700
@@ -1187,7 +1187,8 @@
=cut */
I32
-Perl_unpackstring(pTHX_ const char *pat, const char *patend, const char *s,
const char *strend, U32 flags)
+Perl_unpackstring(pTHX_ char *pat, char *patend, char *s, char *strend,
+ U32 flags)
{
tempsym_t sym;
@@ -2458,7 +2459,8 @@
void
-Perl_pack_cat(pTHX_ SV *cat, const char *pat, const char *patend, register SV
**beglist, SV **endlist, SV ***next_in_list, U32 flags)
+Perl_pack_cat(pTHX_ SV *cat, char *pat, char *patend, register SV **beglist,
+ SV **endlist, SV ***next_in_list, U32 flags)
{
tempsym_t sym;
PERL_UNUSED_ARG(next_in_list);
@@ -2479,7 +2481,8 @@
void
-Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, register SV
**beglist, SV **endlist )
+Perl_packlist(pTHX_ SV *cat, char *pat, char *patend, register SV **beglist,
+ SV **endlist)
{
STRLEN no_len;
tempsym_t sym;
==== //depot/maint-5.8/perl/proto.h#128 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#127~27972~ 2006-04-26 15:56:05.000000000 -0700
+++ perl/proto.h 2006-04-27 07:19:31.000000000 -0700
@@ -1022,8 +1022,8 @@
PERL_CALLCONV void Perl_set_numeric_radix(pTHX);
PERL_CALLCONV void Perl_set_numeric_standard(pTHX);
PERL_CALLCONV void Perl_require_pv(pTHX_ const char* pv);
-PERL_CALLCONV void Perl_pack_cat(pTHX_ SV *cat, const char *pat, const
char *patend, SV **beglist, SV **endlist, SV ***next_in_list, U32 flags);
-PERL_CALLCONV void Perl_packlist(pTHX_ SV *cat, const char *pat, const
char *patend, SV **beglist, SV **endlist);
+PERL_CALLCONV void Perl_pack_cat(pTHX_ SV *cat, char *pat, char *patend,
SV **beglist, SV **endlist, SV ***next_in_list, U32 flags);
+PERL_CALLCONV void Perl_packlist(pTHX_ SV *cat, char *pat, char *patend,
SV **beglist, SV **endlist);
PERL_CALLCONV void Perl_pidgone(pTHX_ Pid_t pid, int status);
PERL_CALLCONV void Perl_pmflag(pTHX_ U32* pmfl, int ch);
PERL_CALLCONV OP* Perl_pmruntime(pTHX_ OP* pm, OP* expr, OP* repl);
@@ -1270,8 +1270,8 @@
#if defined(USE_5005THREADS)
PERL_CALLCONV void Perl_unlock_condpair(pTHX_ void* svv);
#endif
-PERL_CALLCONV I32 Perl_unpack_str(pTHX_ const char *pat, const char
*patend, const char *s, const char *strbeg, const char *strend, char **new_s,
I32 ocnt, U32 flags);
-PERL_CALLCONV I32 Perl_unpackstring(pTHX_ const char *pat, const char
*patend, const char *s, const char *strend, U32 flags);
+PERL_CALLCONV I32 Perl_unpack_str(pTHX_ char *pat, char *patend, char *s,
char *strbeg, char *strend, char **new_s, I32 ocnt, U32 flags);
+PERL_CALLCONV I32 Perl_unpackstring(pTHX_ char *pat, char *patend, char
*s, char *strend, U32 flags);
PERL_CALLCONV void Perl_unsharepvn(pTHX_ const char* sv, I32 len, U32
hash);
PERL_CALLCONV void Perl_unshare_hek(pTHX_ HEK* hek);
PERL_CALLCONV void Perl_utilize(pTHX_ int aver, I32 floor, OP* version,
OP* idop, OP* arg);
@@ -1682,12 +1682,14 @@
#endif
#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
-STATIC I32 S_unpack_rec(pTHX_ struct tempsym* symptr, const char *s, const
char *strbeg, const char *strend, const char **new_s);
-STATIC SV ** S_pack_rec(pTHX_ SV *cat, struct tempsym* symptr, SV **beglist,
SV **endlist);
+STATIC I32 S_unpack_rec(pTHX_ struct tempsym_t* symptr, const char *s,
const char *strbeg, const char *strend, const char **new_s);
+STATIC SV ** S_pack_rec(pTHX_ SV *cat, struct tempsym_t* symptr, SV
**beglist, SV **endlist);
STATIC SV* S_mul128(pTHX_ SV *sv, U8 m);
STATIC I32 S_measure_struct(pTHX_ struct tempsym* symptr);
STATIC bool S_next_symbol(pTHX_ struct tempsym* symptr);
-STATIC SV* S_is_an_int(pTHX_ const char *s, STRLEN l);
+STATIC SV* S_is_an_int(pTHX_ const char *s, STRLEN l)
+ __attribute__warn_unused_result__;
+
STATIC int S_div128(pTHX_ SV *pnum, bool *done);
STATIC const char * S_group_end(pTHX_ const char *pat, const char *patend,
char ender);
STATIC const char * S_get_num(pTHX_ const char *ppat, I32 *lenptr);
End of Patch.
