mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
[skip ci] tree: Fix various typos (#19366)
This commit is contained in:
parent
cd80ed6f7b
commit
433c00b348
4 changed files with 5 additions and 5 deletions
|
@ -194,7 +194,7 @@ PHP_FUNCTION(bindtextdomain)
|
||||||
btd_result = bindtextdomain(ZSTR_VAL(domain), NULL);
|
btd_result = bindtextdomain(ZSTR_VAL(domain), NULL);
|
||||||
if (btd_result == NULL) {
|
if (btd_result == NULL) {
|
||||||
/* POSIX-compliant implementations can return
|
/* POSIX-compliant implementations can return
|
||||||
* NULL if an error occured. On musl you will
|
* NULL if an error occurred. On musl you will
|
||||||
* also get NULL if the domain is not yet
|
* also get NULL if the domain is not yet
|
||||||
* bound, because musl has no default directory
|
* bound, because musl has no default directory
|
||||||
* to return in that case. */
|
* to return in that case. */
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_JIT) && (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
|
#if defined(HAVE_JIT) && (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
|
||||||
static void *find_prefered_mmap_base(size_t requested_size)
|
static void *find_preferred_mmap_base(size_t requested_size)
|
||||||
{
|
{
|
||||||
size_t huge_page_size = 2 * 1024 * 1024;
|
size_t huge_page_size = 2 * 1024 * 1024;
|
||||||
uintptr_t last_free_addr = huge_page_size;
|
uintptr_t last_free_addr = huge_page_size;
|
||||||
|
@ -204,7 +204,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
|
||||||
void *hint;
|
void *hint;
|
||||||
if (JIT_G(enabled) && JIT_G(buffer_size)
|
if (JIT_G(enabled) && JIT_G(buffer_size)
|
||||||
&& zend_jit_check_support() == SUCCESS) {
|
&& zend_jit_check_support() == SUCCESS) {
|
||||||
hint = find_prefered_mmap_base(requested_size);
|
hint = find_preferred_mmap_base(requested_size);
|
||||||
} else {
|
} else {
|
||||||
/* Do not use a hint if JIT is not enabled, as this profits only JIT and
|
/* Do not use a hint if JIT is not enabled, as this profits only JIT and
|
||||||
* this is potentially unsafe when the only suitable candidate is just
|
* this is potentially unsafe when the only suitable candidate is just
|
||||||
|
|
|
@ -78,7 +78,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
|
||||||
/* dummy member so we get at least one member in the struct
|
/* dummy member so we get at least one member in the struct
|
||||||
* and avoids build errors.
|
* and avoids build errors.
|
||||||
*/
|
*/
|
||||||
void *dummymemmber;
|
void *dummymember;
|
||||||
#endif
|
#endif
|
||||||
ZEND_END_MODULE_GLOBALS(pdo_mysql)
|
ZEND_END_MODULE_GLOBALS(pdo_mysql)
|
||||||
|
|
||||||
|
|
|
@ -1481,7 +1481,7 @@ void phpdbg_setup_watchpoints(void) {
|
||||||
#ifdef HAVE_USERFAULTFD_WRITEFAULT
|
#ifdef HAVE_USERFAULTFD_WRITEFAULT
|
||||||
int flags = O_CLOEXEC;
|
int flags = O_CLOEXEC;
|
||||||
#ifdef UFFD_USER_MODE_ONLY
|
#ifdef UFFD_USER_MODE_ONLY
|
||||||
// unpriviliged userfaultfd are disabled by default,
|
// unprivileged userfaultfd are disabled by default,
|
||||||
// with this flag it allows ranges from the user space
|
// with this flag it allows ranges from the user space
|
||||||
// being reported.
|
// being reported.
|
||||||
flags |= UFFD_USER_MODE_ONLY;
|
flags |= UFFD_USER_MODE_ONLY;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue