Skip to content

Commit 7643cf1

Browse files
committed
More precise ifunc resolver return type
Fixes -Wattribute-alias warning.
1 parent fb718cc commit 7643cf1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ext/standard/base64.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,12 @@ zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t lengt
383383
PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) __attribute__((ifunc("resolve_base64_encode")));
384384
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) __attribute__((ifunc("resolve_base64_decode")));
385385

386+
typedef zend_string *(*base64_encode_func_t)(const unsigned char *, size_t);
387+
typedef zend_string *(*base64_decode_func_t)(const unsigned char *, size_t, zend_bool);
388+
386389
ZEND_NO_SANITIZE_ADDRESS
387390
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
388-
static void *resolve_base64_encode() {
391+
static base64_encode_func_t resolve_base64_encode() {
389392
# if ZEND_INTRIN_AVX2_FUNC_PROTO
390393
if (zend_cpu_supports_avx2()) {
391394
return php_base64_encode_avx2;
@@ -401,7 +404,7 @@ static void *resolve_base64_encode() {
401404

402405
ZEND_NO_SANITIZE_ADDRESS
403406
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
404-
static void *resolve_base64_decode() {
407+
static base64_decode_func_t resolve_base64_decode() {
405408
# if ZEND_INTRIN_AVX2_FUNC_PROTO
406409
if (zend_cpu_supports_avx2()) {
407410
return php_base64_decode_ex_avx2;

0 commit comments

Comments
 (0)