Remove mathoms.c stub Perl_instr()

This is now entirely implemented by macros
This commit is contained in:
Karl Williamson 2024-10-21 13:29:32 -06:00 committed by Karl Williamson
parent 0d6c2e8ca4
commit 1e1ce5022a
5 changed files with 8 additions and 20 deletions

View File

@ -1626,7 +1626,7 @@ Cp |void |init_stacks
Cp |void |init_tm |NN struct tm *ptm
p |void |init_uniprops
: Used in perly.y
AMPRTbdp|char * |instr |NN const char *big \
APRTdmp |char * |instr |NN const char *big \
|NN const char *little
Adp |U32 |intro_my
ERXp |Size_t |_inverse_folds |const UV cp \

View File

@ -307,6 +307,7 @@
# define init_i18nl10n(a) Perl_init_i18nl10n(aTHX_ a)
# define init_stacks() Perl_init_stacks(aTHX)
# define init_tm(a) Perl_init_tm(aTHX_ a)
# define instr Perl_instr
# define intro_my() Perl_intro_my(aTHX)
# define isC9_STRICT_UTF8_CHAR Perl_isC9_STRICT_UTF8_CHAR
# define isSTRICT_UTF8_CHAR Perl_isSTRICT_UTF8_CHAR

View File

@ -802,17 +802,6 @@ Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
return NATIVE_TO_UNI(valid_utf8_to_uvchr(s, retlen));
}
/* return ptr to little string in big string, NULL if not found */
/* The original version of this routine was donated by Corey Satten. */
char *
Perl_instr(const char *big, const char *little)
{
PERL_ARGS_ASSERT_INSTR;
return instr(big, little);
}
SV *
Perl_newSVsv(pTHX_ SV *const old)
{

12
proto.h generated
View File

@ -1797,6 +1797,11 @@ Perl_init_uniprops(pTHX)
__attribute__visibility__("hidden");
#define PERL_ARGS_ASSERT_INIT_UNIPROPS
/* PERL_CALLCONV char *
Perl_instr(const char *big, const char *little)
__attribute__warn_unused_result__
__attribute__pure__; */
PERL_CALLCONV U32
Perl_intro_my(pTHX);
#define PERL_ARGS_ASSERT_INTRO_MY
@ -5809,13 +5814,6 @@ PERL_CALLCONV SV **
Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, int flags);
# define PERL_ARGS_ASSERT_HV_STORE_FLAGS
PERL_CALLCONV char *
Perl_instr(const char *big, const char *little)
__attribute__warn_unused_result__
__attribute__pure__;
# define PERL_ARGS_ASSERT_INSTR \
assert(big); assert(little)
PERL_CALLCONV STRLEN
Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end);
# define PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF \

2
util.h
View File

@ -241,7 +241,7 @@ returning NULL if not found. The terminating NUL bytes are not compared.
*/
#define instr(haystack, needle) strstr((char *) haystack, (char *) needle)
#define Perl_instr(haystack, needle) strstr((char *) haystack, (char *) needle)
#ifdef HAS_MEMMEM
# define ninstr(big, bigend, little, lend) \