Skip to content

Commit 0429159

Browse files
committed
Fully convert accel_remap_huge_pages to use zend_result
Changes were lost during rebase...
1 parent 1380b65 commit 0429159

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2937,7 +2937,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
29372937
# endif
29382938

29392939
# if defined(MAP_HUGETLB) || defined(MADV_HUGEPAGE)
2940-
static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, const char *name, size_t offset)
2940+
static zend_result accel_remap_huge_pages(void *start, size_t size, size_t real_size, const char *name, size_t offset)
29412941
{
29422942
void *ret = MAP_FAILED;
29432943
void *mem;
@@ -2950,7 +2950,7 @@ static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, co
29502950
zend_error(E_WARNING,
29512951
ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap failed: %s (%d)",
29522952
strerror(errno), errno);
2953-
return -1;
2953+
return FAILURE;
29542954
}
29552955
memcpy(mem, start, real_size);
29562956

@@ -2975,7 +2975,7 @@ static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, co
29752975
zend_error(E_WARNING,
29762976
ACCELERATOR_PRODUCT_NAME " huge_code_pages: madvise(HUGEPAGE) failed: %s (%d)",
29772977
strerror(errno), errno);
2978-
return -1;
2978+
return FAILURE;
29792979
}
29802980
# else
29812981
memcpy(start, mem, real_size);

0 commit comments

Comments
 (0)