Skip to content

Commit 19a5403

Browse files
committed
regexec.c: Remove no-value-added function
This function merely calls an inline one. Might as well not have any indirection.
1 parent d0895a3 commit 19a5403

File tree

4 files changed

+1
-20
lines changed

4 files changed

+1
-20
lines changed

embed.fnc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5575,10 +5575,6 @@ ESW |void |regcp_restore |NN regexp *rex \
55755575
ERST |U8 * |reghop3 |NN U8 *s \
55765576
|SSize_t off \
55775577
|NN const U8 *lim
5578-
ERST |U8 * |reghop4 |NN U8 *s \
5579-
|SSize_t off \
5580-
|NN const U8 *llim \
5581-
|NN const U8 *rlim
55825578
ERST |U8 * |reghopmaybe3 |NN U8 *s \
55835579
|SSize_t off \
55845580
|NN const U8 * const lim

embed.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1987,7 +1987,6 @@
19871987
# define regcppop(a,b) S_regcppop(aTHX_ a,b comma_aDEPTH)
19881988
# define regcppush(a,b,c) S_regcppush(aTHX_ a,b,c comma_aDEPTH)
19891989
# define reghop3 S_reghop3
1990-
# define reghop4 S_reghop4
19911990
# define reghopmaybe3 S_reghopmaybe3
19921991
# define reginclass(a,b,c,d,e) S_reginclass(aTHX_ a,b,c,d,e)
19931992
# define regmatch(a,b,c) S_regmatch(aTHX_ a,b,c)

proto.h

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

regexec.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static const char non_utf8_target_but_utf8_required[]
164164
#define HOP3clim(pos,off,lim) ((char*)HOP3lim(pos,off,lim))
165165

166166
#define HOP4(pos,off,llim, rlim) (reginfo->is_utf8_target \
167-
? reghop4((U8*)(pos), off, (U8*)(llim), (U8*)(rlim)) \
167+
? utf8_hop_safe((U8*)(pos), off, (U8*)(llim), (U8*)(rlim)) \
168168
: (U8*)(pos + off))
169169
#define HOP4c(pos,off,llim, rlim) ((char*)HOP4(pos,off,llim, rlim))
170170

@@ -11158,14 +11158,6 @@ S_reghop3(U8 *s, SSize_t off, const U8* lim)
1115811158
return s;
1115911159
}
1116011160

11161-
STATIC U8 *
11162-
S_reghop4(U8 *s, SSize_t off, const U8* llim, const U8* rlim)
11163-
{
11164-
PERL_ARGS_ASSERT_REGHOP4;
11165-
11166-
return utf8_hop_safe(s, off, llim, rlim);
11167-
}
11168-
1116911161
/* like reghop3, but returns NULL on overrun, rather than returning last
1117011162
* char pos */
1117111163

0 commit comments

Comments
 (0)