From: kosako Date: Mon, 28 Mar 2016 06:19:09 +0000 (+0900) Subject: remove unused macro X-Git-Tag: v6.0.0^2~90 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2938f1b71fa8e7542465381fbbd85475db280a70;p=onig remove unused macro --- diff --git a/src/oniguruma.h b/src/oniguruma.h index adf4efc..baf0dc0 100644 --- a/src/oniguruma.h +++ b/src/oniguruma.h @@ -650,9 +650,6 @@ extern void onig_null_warn P_((const char* s)); #define ONIG_STATE_COMPILING -1 #define ONIG_STATE_MODIFY -2 -#define ONIG_STATE(reg) \ - ((reg)->state > 0 ? ONIG_STATE_SEARCHING : (reg)->state) - typedef struct re_pattern_buffer { /* common members of BBuf(bytes-buffer) */ unsigned char* p; /* compiled pattern */ diff --git a/src/regexec.c b/src/regexec.c index 2e94a94..2c768e1 100644 --- a/src/regexec.c +++ b/src/regexec.c @@ -3081,7 +3081,6 @@ onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at, On } MATCH_ARG_FREE(msa); - ONIG_STATE_DEC_THREAD(reg); return r; } @@ -3664,7 +3663,6 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end, finish: MATCH_ARG_FREE(msa); - ONIG_STATE_DEC_THREAD(reg); /* If result is mismatch and no FIND_NOT_EMPTY option, then the region is not setted in match_at(). */ @@ -3685,7 +3683,6 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end, mismatch_no_msa: r = ONIG_MISMATCH; finish_no_msa: - ONIG_STATE_DEC_THREAD(reg); #ifdef ONIG_DEBUG if (r != ONIG_MISMATCH) fprintf(stderr, "onig_search: error %d\n", r); @@ -3693,7 +3690,6 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end, return r; match: - ONIG_STATE_DEC_THREAD(reg); MATCH_ARG_FREE(msa); return s - str; } diff --git a/src/regint.h b/src/regint.h index 676f560..9cea2c0 100644 --- a/src/regint.h +++ b/src/regint.h @@ -144,11 +144,6 @@ #endif -#define ONIG_STATE_INC(reg) /* Nothing */ -#define ONIG_STATE_DEC(reg) /* Nothing */ -#define ONIG_STATE_INC_THREAD(reg) /* Nothing */ -#define ONIG_STATE_DEC_THREAD(reg) /* Nothing */ - #ifdef HAVE_STDLIB_H #include #endif