diff options
author | twosee <twose@qq.com> | 2020-07-23 00:59:00 +0800 |
---|---|---|
committer | twosee <twose@qq.com> | 2020-07-23 00:59:00 +0800 |
commit | 6e92487f66794befb9d312a92e5b383dec012daf (patch) | |
tree | 363fe7cc4c967ddb538d88108fd17a72ccc90aac | |
parent | a65ec4c2db58632b0d9b76516d0fe6d2b5fb4ba5 (diff) | |
download | php-git-6e92487f66794befb9d312a92e5b383dec012daf.tar.gz |
Fix warnings of strict-prototypes
Closes GH-5887.
-rw-r--r-- | Zend/zend.c | 4 | ||||
-rw-r--r-- | Zend/zend.h | 4 | ||||
-rw-r--r-- | Zend/zend_cpuinfo.h | 2 | ||||
-rw-r--r-- | Zend/zend_exceptions.c | 2 | ||||
-rw-r--r-- | Zend/zend_weakrefs.c | 4 | ||||
-rw-r--r-- | Zend/zend_weakrefs.h | 4 | ||||
-rw-r--r-- | ext/standard/var.c | 2 | ||||
-rw-r--r-- | ext/standard/var_unserializer.re | 2 | ||||
-rw-r--r-- | main/main.c | 6 | ||||
-rw-r--r-- | win32/sendmail.c | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index a38201baeb..847fbada4d 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1774,12 +1774,12 @@ ZEND_API void zend_map_ptr_extend(size_t last) } } -void zend_startup_error_notify_callbacks() +void zend_startup_error_notify_callbacks(void) { zend_llist_init(&zend_error_notify_callbacks, sizeof(zend_error_notify_cb), NULL, 1); } -void zend_shutdown_error_notify_callbacks() +void zend_shutdown_error_notify_callbacks(void) { zend_llist_destroy(&zend_error_notify_callbacks); } diff --git a/Zend/zend.h b/Zend/zend.h index 659466322e..5963ca7d9a 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -355,8 +355,8 @@ typedef void (*zend_error_notify_cb)(int type, const char *error_filename, uint3 BEGIN_EXTERN_C() ZEND_API void zend_register_error_notify_callback(zend_error_notify_cb callback); -void zend_startup_error_notify_callbacks(); -void zend_shutdown_error_notify_callbacks(); +void zend_startup_error_notify_callbacks(void); +void zend_shutdown_error_notify_callbacks(void); void zend_error_notify_all_callbacks(int type, const char *error_filename, uint32_t error_lineno, zend_string *message); END_EXTERN_C() diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h index 0b6b54e51a..b8b08e7ad0 100644 --- a/Zend/zend_cpuinfo.h +++ b/Zend/zend_cpuinfo.h @@ -97,7 +97,7 @@ typedef enum _zend_cpu_feature { /*intentionally don't support = (1<<31 | ZEND_CPU_EDX_MASK)*/ } zend_cpu_feature; -void zend_cpu_startup(); +void zend_cpu_startup(void); ZEND_API int zend_cpu_supports(zend_cpu_feature feature); #ifndef __has_attribute diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 753bcd4b4a..be0eb1c33e 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -998,7 +998,7 @@ ZEND_API ZEND_COLD void zend_throw_exception_object(zval *exception) /* {{{ */ } /* }}} */ -ZEND_API ZEND_COLD void zend_throw_unwind_exit() +ZEND_API ZEND_COLD void zend_throw_unwind_exit(void) { ZEND_ASSERT(!EG(exception)); EG(exception) = zend_objects_new(&zend_ce_unwind_exit); diff --git a/Zend/zend_weakrefs.c b/Zend/zend_weakrefs.c index ec3d81fbb0..8a444c214e 100644 --- a/Zend/zend_weakrefs.c +++ b/Zend/zend_weakrefs.c @@ -140,7 +140,7 @@ static void zend_weakref_unregister(zend_object *object, void *payload) { } } -void zend_weakrefs_init() { +void zend_weakrefs_init(void) { zend_hash_init(&EG(weakrefs), 8, NULL, NULL, 0); } @@ -158,7 +158,7 @@ void zend_weakrefs_notify(zend_object *object) { } } -void zend_weakrefs_shutdown() { +void zend_weakrefs_shutdown(void) { zend_ulong obj_addr; void *tagged_ptr; ZEND_HASH_FOREACH_NUM_KEY_PTR(&EG(weakrefs), obj_addr, tagged_ptr) { diff --git a/Zend/zend_weakrefs.h b/Zend/zend_weakrefs.h index cf902f3dd4..2cce74524f 100644 --- a/Zend/zend_weakrefs.h +++ b/Zend/zend_weakrefs.h @@ -23,8 +23,8 @@ extern ZEND_API zend_class_entry *zend_ce_weakref; void zend_register_weakref_ce(void); -void zend_weakrefs_init(); -void zend_weakrefs_shutdown(); +void zend_weakrefs_init(void); +void zend_weakrefs_shutdown(void); ZEND_API void zend_weakrefs_notify(zend_object *object); diff --git a/ext/standard/var.c b/ext/standard/var.c index 17540f56cd..e835666ddb 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -1114,7 +1114,7 @@ PHPAPI void php_var_serialize(smart_str *buf, zval *struc, php_serialize_data_t } /* }}} */ -PHPAPI php_serialize_data_t php_var_serialize_init() { +PHPAPI php_serialize_data_t php_var_serialize_init(void) { struct php_serialize_data *d; /* fprintf(stderr, "SERIALIZE_INIT == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ if (BG(serialize_lock) || !BG(serialize).level) { diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 8df8480501..1fc0e0dcda 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -52,7 +52,7 @@ struct php_unserialize_data { var_entries entries; }; -PHPAPI php_unserialize_data_t php_var_unserialize_init() { +PHPAPI php_unserialize_data_t php_var_unserialize_init(void) { php_unserialize_data_t d; /* fprintf(stderr, "UNSERIALIZE_INIT == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ if (BG(serialize_lock) || !BG(unserialize).level) { diff --git a/main/main.c b/main/main.c index 9c0c8c11b9..cc0e764561 100644 --- a/main/main.c +++ b/main/main.c @@ -522,7 +522,7 @@ static PHP_INI_DISP(display_errors_mode) } /* }}} */ -PHPAPI const char *php_get_internal_encoding() { +PHPAPI const char *php_get_internal_encoding(void) { if (PG(internal_encoding) && PG(internal_encoding)[0]) { return PG(internal_encoding); } else if (SG(default_charset) && SG(default_charset)[0]) { @@ -531,7 +531,7 @@ PHPAPI const char *php_get_internal_encoding() { return "UTF-8"; } -PHPAPI const char *php_get_input_encoding() { +PHPAPI const char *php_get_input_encoding(void) { if (PG(input_encoding) && PG(input_encoding)[0]) { return PG(input_encoding); } else if (SG(default_charset) && SG(default_charset)[0]) { @@ -540,7 +540,7 @@ PHPAPI const char *php_get_input_encoding() { return "UTF-8"; } -PHPAPI const char *php_get_output_encoding() { +PHPAPI const char *php_get_output_encoding(void) { if (PG(output_encoding) && PG(output_encoding)[0]) { return PG(output_encoding); } else if (SG(default_charset) && SG(default_charset)[0]) { diff --git a/win32/sendmail.c b/win32/sendmail.c index ff57da88c2..3d73ef9b5b 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -300,7 +300,7 @@ PHPAPI int TSendMail(const char *host, int *error, char **error_message, // Author/Date: jcar 20/9/96 // History: //********************************************************************/ -PHPAPI void TSMClose() +PHPAPI void TSMClose(void) { Post("QUIT\r\n"); Ack(NULL); |