tweak some regexp params to avoid warnings

Message-ID: <9b18b3110705011446h2113221cndf70af928d72505@mail.gmail.com>

p4raw-id: //depot/perl@31118

diff --git a/embed.fnc b/embed.fnc
index 8fc1aa3..70cfbe5 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -687,7 +687,7 @@ Ap  |REGEXP*|pregcomp       |NN const SV * const pattern|const U32 flags
 Ap     |REGEXP*|re_compile     |NN const SV * const pattern|const U32 flags
 Ap     |char*  |re_intuit_start|NN REGEXP * const rx|NULLOK SV* sv|NN char* strpos \
                                |NN char* strend|const U32 flags \
 Ap     |REGEXP*|re_compile     |NN const SV * const pattern|const U32 flags
 Ap     |char*  |re_intuit_start|NN REGEXP * const rx|NULLOK SV* sv|NN char* strpos \
                                |NN char* strend|const U32 flags \

-                               |NULLOK struct re_scream_pos_data_s *data
+                               |NULLOK re_scream_pos_data *data

 Ap     |SV*    |re_intuit_string|NN REGEXP * const rx
 Ap     |I32    |regexec_flags  |NN REGEXP * const rx|NN char* stringarg \
                                |NN char* strend|NN char* strbeg|I32 minend \
 Ap     |SV*    |re_intuit_string|NN REGEXP * const rx
 Ap     |I32    |regexec_flags  |NN REGEXP * const rx|NN char* stringarg \
                                |NN char* strend|NN char* strbeg|I32 minend \

diff --git a/perl.h b/perl.h
index 49c8e1a..8919988 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -4421,7 +4421,7 @@ typedef I32 (CPERLscope(*regexec_t)) (pTHX_ regexp* prog, char* stringarg,
 typedef char* (CPERLscope(*re_intuit_start_t)) (pTHX_ regexp *prog, SV *sv,
                                                char *strpos, char *strend,
                                                U32 flags,
 typedef char* (CPERLscope(*re_intuit_start_t)) (pTHX_ regexp *prog, SV *sv,
                                                char *strpos, char *strend,
                                                U32 flags,

-                                               struct re_scream_pos_data_s *d);
+                                               re_scream_pos_data *d);

 typedef SV*    (CPERLscope(*re_intuit_string_t)) (pTHX_ regexp *prog);
 typedef void   (CPERLscope(*regfree_t)) (pTHX_ struct regexp* r);
 typedef regexp*(CPERLscope(*regdupe_t)) (pTHX_ const regexp* r, CLONE_PARAMS *param);
 typedef SV*    (CPERLscope(*re_intuit_string_t)) (pTHX_ regexp *prog);
 typedef void   (CPERLscope(*regfree_t)) (pTHX_ struct regexp* r);
 typedef regexp*(CPERLscope(*regdupe_t)) (pTHX_ const regexp* r, CLONE_PARAMS *param);

diff --git a/proto.h b/proto.h
index 7cb0ce7..85f2c11 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1873,7 +1873,7 @@ PERL_CALLCONV REGEXP*     Perl_pregcomp(pTHX_ const SV * const pattern, const U32 fl
 PERL_CALLCONV REGEXP*  Perl_re_compile(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)
                        __attribute__nonnull__(pTHX_1);
 

-PERL_CALLCONV char*    Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV* sv, char* strpos, char* strend, const U32 flags, struct re_scream_pos_data_s *data)
+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)

                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_3)
                        __attribute__nonnull__(pTHX_4);
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_3)
                        __attribute__nonnull__(pTHX_4);

diff --git a/regexec.c b/regexec.c
index 0b0cc6c..ba0f2b7 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -373,7 +373,7 @@ Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, register char *strend,
 
 char *
 Perl_re_intuit_start(pTHX_ REGEXP * const prog, SV *sv, char *strpos,
 
 char *
 Perl_re_intuit_start(pTHX_ REGEXP * const prog, SV *sv, char *strpos,

-                    char *strend, U32 flags, re_scream_pos_data *data)
+                    char *strend, const U32 flags, re_scream_pos_data *data)

 {
     dVAR;
     register I32 start_shift = 0;
 {
     dVAR;
     register I32 start_shift = 0;

diff --git a/regexp.h b/regexp.h
index ac9e96b..d18c2d3 100644 (file)
--- a/regexp.h
+++ b/regexp.h
@@ -117,8 +117,8 @@ typedef struct regexp_engine {
                      char* strbeg, I32 minend, SV* screamer,
                      void* data, U32 flags);
     char*   (*intuit) (pTHX_ REGEXP * const rx, SV *sv, char *strpos,
                      char* strbeg, I32 minend, SV* screamer,
                      void* data, U32 flags);
     char*   (*intuit) (pTHX_ REGEXP * const rx, SV *sv, char *strpos,

-                       char *strend, U32 flags,
-                       struct re_scream_pos_data_s *data);
+                       char *strend, const U32 flags,
+                       re_scream_pos_data *data);

     SV*     (*checkstr) (pTHX_ REGEXP * const rx);
     void    (*free) (pTHX_ REGEXP * const rx);
     void    (*numbered_buff_get) (pTHX_ REGEXP * const rx,
     SV*     (*checkstr) (pTHX_ REGEXP * const rx);
     void    (*free) (pTHX_ REGEXP * const rx);
     void    (*numbered_buff_get) (pTHX_ REGEXP * const rx,