Zend/zend.h: move zend_error*() prototypes to zend_error.h

Author: MaxKellermann

Zend/zend.h

@@ -24,8 +24,8 @@
 
 #define ZEND_ENGINE_3
 
+#include "zend_error.h" // TODO remove
 #include "zend_map_ptr.h" // for ZEND_MAP_PTR_DEF()
-#include "zend_errors.h" // for E_* (as zend_error_noreturn() parameter)
 #include "zend_portability.h" // for BEGIN_EXTERN_C
 #include "zend_result.h"
 #include "zend_signal.h" // for ZEND_SIGNAL_[UN]BLOCK_INTERRUPTIONS()
@@ -343,16 +343,6 @@ extern ZEND_API zend_string *(*zend_resolve_path)(zend_string *filename);
 extern ZEND_API zend_result (*zend_post_startup_cb)(void);
 extern ZEND_API void (*zend_post_shutdown_cb)(void);
 
-ZEND_API ZEND_COLD void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-/* For custom format specifiers like H */
-ZEND_API ZEND_COLD void zend_error_unchecked(int type, const char *format, ...);
-/* If filename is NULL the default filename is used. */
-ZEND_API ZEND_COLD void zend_error_at(int type, zend_string *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
-ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_at_noreturn(int type, zend_string *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
-ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message);
-ZEND_API ZEND_COLD void zend_error_zstr_at(int type, zend_string *filename, uint32_t lineno, zend_string *message);
-
 ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
 ZEND_API ZEND_COLD void zend_type_error(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);
 ZEND_API ZEND_COLD void zend_argument_count_error(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);

Zend/zend_arena.h

@@ -21,7 +21,7 @@
 
 #include "zend_alloc.h"
 #include "zend_multiply.h" // for zend_safe_address()
-#include "zend.h" // for zend_error()
+#include "zend_error.h"
 
 #include <stddef.h> // for size_t
 

Zend/zend_error.h

@@ -0,0 +1,41 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) Zend Technologies Ltd. (http://www.zend.com)           |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_ERROR_H
+#define ZEND_ERROR_H
+
+#include "zend_errors.h" // for E_* (as zend_error_noreturn() parameter)
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+#include <stdint.h>
+
+typedef struct _zend_string zend_string;
+
+BEGIN_EXTERN_C()
+
+ZEND_API ZEND_COLD void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
+ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
+/* For custom format specifiers like H */
+ZEND_API ZEND_COLD void zend_error_unchecked(int type, const char *format, ...);
+/* If filename is NULL the default filename is used. */
+ZEND_API ZEND_COLD void zend_error_at(int type, zend_string *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
+ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_at_noreturn(int type, zend_string *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
+ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message);
+ZEND_API ZEND_COLD void zend_error_zstr_at(int type, zend_string *filename, uint32_t lineno, zend_string *message);
+
+END_EXTERN_C()
+
+#endif /* ZEND_H */

Zend/zend_gc.c

@@ -73,7 +73,7 @@
 #include "zend_globals.h" // for struct _zend_executor_globals
 #include "zend_globals_macros.h" // for EG()
 #include "zend_objects.h" // for zend_objects_destroy_object()
-#include "zend.h" // for zend_error()
+#include "zend_error.h"
 
 #ifndef GC_BENCH
 # define GC_BENCH 0

Zend/zend_multiply.h

@@ -20,9 +20,9 @@
 #ifndef ZEND_MULTIPLY_H
 #define ZEND_MULTIPLY_H
 
+#include "zend_error.h"
 #include "zend_long.h"
 #include "zend_portability.h"
-#include "zend.h"
 
 #include <stdbool.h>
 

Zend/zend_strtod.c

@@ -189,7 +189,7 @@
 #include "zend_strtod.h"
 #include "zend_strtod_int.h"
 #include "zend_types.h" // for ZEND_TLS
-#include "zend.h" // for zend_error_noreturn()
+#include "zend_error.h"
 
 #ifndef Long
 #define Long int32_t