This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
regcomp.c: Rmv unused parameter
authorKarl Williamson <public@khwilliamson.com>
Wed, 9 Mar 2011 06:08:16 +0000 (23:08 -0700)
committerKarl Williamson <public@khwilliamson.com>
Wed, 9 Mar 2011 06:22:19 +0000 (23:22 -0700)
This silences a compiler warning

embed.fnc
proto.h
regcomp.c

index cc748c8..690d03c 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1803,8 +1803,7 @@ Es        |bool   |reg_skipcomment|NN struct RExC_state_t *pRExC_state
 Es     |void   |scan_commit    |NN const struct RExC_state_t *pRExC_state \
                                |NN struct scan_data_t *data|NN I32 *minlenp \
                                |int is_inf
-Esn    |void   |cl_anything    |NN const struct RExC_state_t *pRExC_state \
-                               |NN struct regnode_charclass_class *cl
+Esn    |void   |cl_anything    |NN struct regnode_charclass_class *cl
 EsRn   |int    |cl_is_anything |NN const struct regnode_charclass_class *cl
 Esn    |void   |cl_init        |NN const struct RExC_state_t *pRExC_state \
                                |NN struct regnode_charclass_class *cl
diff --git a/proto.h b/proto.h
index 03ced95..c6b2d78 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -5988,11 +5988,10 @@ STATIC void     S_cl_and(struct regnode_charclass_class *cl, const struct regnode_ch
 #define PERL_ARGS_ASSERT_CL_AND        \
        assert(cl); assert(and_with)
 
-STATIC void    S_cl_anything(const struct RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
-                       __attribute__nonnull__(1)
-                       __attribute__nonnull__(2);
+STATIC void    S_cl_anything(struct regnode_charclass_class *cl)
+                       __attribute__nonnull__(1);
 #define PERL_ARGS_ASSERT_CL_ANYTHING   \
-       assert(pRExC_state); assert(cl)
+       assert(cl)
 
 STATIC void    S_cl_init(const struct RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
                        __attribute__nonnull__(1)
index 1f29084..ebd1203 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -720,7 +720,7 @@ S_scan_commit(pTHX_ const RExC_state_t *pRExC_state, scan_data_t *data, I32 *min
 
 /* Can match anything (initialization) */
 STATIC void
-S_cl_anything(const RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
+S_cl_anything(struct regnode_charclass_class *cl)
 {
     PERL_ARGS_ASSERT_CL_ANYTHING;
 
@@ -755,7 +755,7 @@ S_cl_init(const RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
 
     Zero(cl, 1, struct regnode_charclass_class);
     cl->type = ANYOF;
-    cl_anything(pRExC_state, cl);
+    cl_anything(cl);
     ARG_SET(cl, ANYOF_NONBITMAP_EMPTY);
 }
 
@@ -865,7 +865,7 @@ S_cl_or(const RExC_state_t *pRExC_state, struct regnode_charclass_class *cl, con
          * complement of everything not in the bitmap, but currently we don't
          * know what that is, so give up and match anything */
        if (ANYOF_NONBITMAP(or_with)) {
-           cl_anything(pRExC_state, cl);
+           cl_anything(cl);
        }
        /* We do not use
         * (B1 | CL1) | (!B2 & !CL2) = (B1 | !B2 & !CL2) | (CL1 | (!B2 & !CL2))
@@ -885,7 +885,7 @@ S_cl_or(const RExC_state_t *pRExC_state, struct regnode_charclass_class *cl, con
                cl->bitmap[i] |= ~or_with->bitmap[i];
        } /* XXXX: logic is complicated otherwise */
        else {
-           cl_anything(pRExC_state, cl);
+           cl_anything(cl);
        }
 
         /* And, we can just take the union of the flags that aren't affected
@@ -918,7 +918,7 @@ S_cl_or(const RExC_state_t *pRExC_state, struct regnode_charclass_class *cl, con
            }
        }
        else { /* XXXX: logic is complicated, leave it along for a moment. */
-           cl_anything(pRExC_state, cl);
+           cl_anything(cl);
        }
 
         /* Take the union */
@@ -3090,7 +3090,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp,
                     }
                     is_inf = is_inf_internal = 1;
                     if (flags & SCF_DO_STCLASS_OR) /* Allow everything */
-                        cl_anything(pRExC_state, data->start_class);
+                        cl_anything(data->start_class);
                     flags &= ~SCF_DO_STCLASS;
                }
             } else {
@@ -3645,7 +3645,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp,
                }
                is_inf = is_inf_internal = 1;
                if (flags & SCF_DO_STCLASS_OR)
-                   cl_anything(pRExC_state, data->start_class);
+                   cl_anything(data->start_class);
                flags &= ~SCF_DO_STCLASS;
                break;
            }
@@ -3708,7 +3708,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp,
                  do_default:
                    /* Perl_croak(aTHX_ "panic: unexpected simple REx opcode %d", OP(scan)); */
                    if (flags & SCF_DO_STCLASS_OR) /* Allow everything */
-                       cl_anything(pRExC_state, data->start_class);
+                       cl_anything(data->start_class);
                    break;
                case REG_ANY:
                    if (OP(scan) == SANY)
@@ -3716,7 +3716,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp,
                    if (flags & SCF_DO_STCLASS_OR) { /* Everything but \n */
                        value = (ANYOF_BITMAP_TEST(data->start_class,'\n')
                                 || ANYOF_CLASS_TEST_ANY_SET(data->start_class));
-                       cl_anything(pRExC_state, data->start_class);
+                       cl_anything(data->start_class);
                    }
                    if (flags & SCF_DO_STCLASS_AND || !value)
                        ANYOF_BITMAP_CLEAR(data->start_class,'\n');
@@ -4142,7 +4142,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp,
                }
                is_inf = is_inf_internal = 1;
                if (flags & SCF_DO_STCLASS_OR) /* Allow everything */
-                   cl_anything(pRExC_state, data->start_class);
+                   cl_anything(data->start_class);
                flags &= ~SCF_DO_STCLASS;
        }
        else if (OP(scan) == GPOS) {