From: Steve Hay Date: Wed, 9 Jan 2008 17:59:11 +0000 (+0000) Subject: Fix prototype in regexp code following #32851, and regen X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0a0b43fa5b4c00dcd9c6c26dea968d2368fc6eae;p=p5sagit%2Fp5-mst-13.2.git Fix prototype in regexp code following #32851, and regen p4raw-id: //depot/perl@32925 --- diff --git a/embed.fnc b/embed.fnc index cfe292b..e7e978b 100644 --- a/embed.fnc +++ b/embed.fnc @@ -693,7 +693,7 @@ Ap |char * |reg_stringify |NN MAGIC *mg|NULLOK STRLEN *lp|NULLOK U32 *flags|NUL Ap |void* |regdupe_internal|NN REGEXP * const r|NN CLONE_PARAMS* param #endif Ap |REGEXP*|pregcomp |NN const SV * const pattern|const U32 flags -Ap |REGEXP*|re_compile |NN const SV * const pattern|const U32 flags +Ap |REGEXP*|re_compile |NN const SV * const pattern|U32 flags Ap |char* |re_intuit_start|NN REGEXP * const rx|NULLOK SV* sv|NN char* strpos \ |NN char* strend|const U32 flags \ |NULLOK re_scream_pos_data *data diff --git a/pod/perlapi.pod b/pod/perlapi.pod index d139026..514e158 100644 --- a/pod/perlapi.pod +++ b/pod/perlapi.pod @@ -1562,7 +1562,7 @@ X Returns whether the C value returned by C is encoded in UTF-8, doing any necessary dereferencing of possibly C keys. The value returned -will be 0 or non-0, not necesarily 1 (or even a value with any low bits set), +will be 0 or non-0, not necessarily 1 (or even a value with any low bits set), so B blindly assign this to a C variable, as C may be a typedef for C. diff --git a/proto.h b/proto.h index d24ba1e..0602069 100644 --- a/proto.h +++ b/proto.h @@ -1871,7 +1871,7 @@ PERL_CALLCONV void* Perl_regdupe_internal(pTHX_ REGEXP * const r, CLONE_PARAMS* PERL_CALLCONV REGEXP* Perl_pregcomp(pTHX_ const SV * const pattern, const U32 flags) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV REGEXP* Perl_re_compile(pTHX_ const SV * const pattern, const U32 flags) +PERL_CALLCONV REGEXP* Perl_re_compile(pTHX_ const SV * const pattern, U32 flags) __attribute__nonnull__(pTHX_1); PERL_CALLCONV char* Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV* sv, char* strpos, char* strend, const U32 flags, re_scream_pos_data *data) diff --git a/regexp.h b/regexp.h index b41c0a4..74973ae 100644 --- a/regexp.h +++ b/regexp.h @@ -129,7 +129,7 @@ typedef struct re_scream_pos_data_s * Any regex engine implementation must be able to build one of these. */ typedef struct regexp_engine { - REGEXP* (*comp) (pTHX_ const SV * const pattern, const U32 flags); + REGEXP* (*comp) (pTHX_ const SV * const pattern, U32 flags); I32 (*exec) (pTHX_ REGEXP * const rx, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, void* data, U32 flags);