Skip to content

Commit 31e9a35

Browse files
committed
Move some common variable definitions out
1 parent 50677b6 commit 31e9a35

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

ext/mbstring/libmbfl/mbfl/mbfilter.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -881,14 +881,15 @@ mbfl_strpos(
881881
goto out;
882882
}
883883

884+
885+
size_t jtbl[1 << (sizeof(unsigned char) * 8)];
886+
size_t needle_u8_len = needle_u8->len;
887+
size_t i;
888+
const unsigned char *p, *q, *e;
889+
const unsigned char *haystack_u8_val = haystack_u8->val,
890+
*needle_u8_val = needle_u8->val;
884891
/* Bug somewhere in this segment for Out Of Bound detection (normal mode i.e. !reverse with negative offsets) */
885892
if (!reverse) {
886-
size_t jtbl[1 << (sizeof(unsigned char) * 8)];
887-
size_t needle_u8_len = needle_u8->len;
888-
size_t i;
889-
const unsigned char *p, *q, *e;
890-
const unsigned char *haystack_u8_val = haystack_u8->val,
891-
*needle_u8_val = needle_u8->val;
892893
for (i = 0; i < sizeof(jtbl) / sizeof(*jtbl); ++i) {
893894
jtbl[i] = needle_u8_len + 1;
894895
}
@@ -935,12 +936,8 @@ mbfl_strpos(
935936
}
936937
}
937938
} else {
938-
size_t jtbl[1 << (sizeof(unsigned char) * 8)];
939-
size_t needle_u8_len = needle_u8->len, needle_len = 0;
940-
size_t i;
941-
const unsigned char *p, *e, *q, *qe;
942-
const unsigned char *haystack_u8_val = haystack_u8->val,
943-
*needle_u8_val = needle_u8->val;
939+
size_t needle_len = 0;
940+
const unsigned char *qe;
944941
for (i = 0; i < sizeof(jtbl) / sizeof(*jtbl); ++i) {
945942
jtbl[i] = needle_u8_len;
946943
}

0 commit comments

Comments
 (0)