Inline list iteration to avoid va_list in va_list inception problems, va_copy va_list and cleanup callback name code.

Author: beberlei

Zend/zend.c

@@ -851,7 +851,7 @@ int zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 			zend_execute_ex = dtrace_execute_ex;
 			zend_execute_internal = dtrace_execute_internal;
 
-			zend_register_error_notify_callback("dtrace", dtrace_error_notify_cb);
+			zend_register_error_notify_callback(dtrace_error_notify_cb);
 		} else {
 			zend_compile_file = compile_file;
 			zend_execute_ex = execute_ex;
@@ -1769,7 +1769,6 @@ ZEND_API void zend_map_ptr_extend(size_t last)
 
 static void zend_error_notify_callback_dtor(zend_error_notify_callback *callback)
 {
-	free(callback->name);
 }
 
 int zend_startup_error_notify_callbacks()
@@ -1786,29 +1785,25 @@ int zend_shutdown_error_notify_callbacks()
 	return SUCCESS;
 }
 
-void zend_error_notify_callbacks_apply(llist_apply_func_t callback)
+void zend_register_error_notify_callback(zend_error_notify_cb cb)
 {
-	zend_llist_apply(&zend_error_notify_callbacks, callback);
-}
-
-void zend_register_error_notify_callback(const char *name, zend_error_notify_cb cb)
-{
-	ZEND_ASSERT(name != NULL);
-
 	zend_error_notify_callback callback;
 
-	callback.name = strdup(name);
 	callback.notify_callback = cb;
 
 	zend_llist_add_element(&zend_error_notify_callbacks, &callback);
 }
 
-static void zend_error_notify_single_callback(zend_error_notify_callback *callback, int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
-{
-	callback->notify_callback(type, error_filename, error_lineno, format, args);
-}
-
 void zend_error_notify_all_callbacks(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
 {
-	zend_llist_apply_with_arguments(&zend_error_notify_callbacks, (llist_apply_with_args_func_t) zend_error_notify_single_callback, 5, type, error_filename, error_lineno, format, args);
+	zend_llist_element *element;
+	zend_error_notify_callback *callback;
+	va_list argcopy;
+
+	for (element = zend_error_notify_callbacks.head; element; element = element->next) {
+		va_copy(argcopy, args);
+		callback = (zend_error_notify_callback*) element->data;
+		callback->notify_callback(type, error_filename, error_lineno, format, argcopy);
+		va_end(argcopy);
+	}
 }

Zend/zend.h

@@ -353,15 +353,13 @@ typedef void (*zend_error_notify_cb)(int type, const char *error_filename, const
 
 BEGIN_EXTERN_C()
 typedef struct {
-	char *name;
 	zend_error_notify_cb notify_callback;
 } zend_error_notify_callback;
 
-void zend_register_error_notify_callback(const char *name, zend_error_notify_cb callback);
+void zend_register_error_notify_callback(zend_error_notify_cb callback);
 int zend_startup_error_notify_callbacks();
 int zend_shutdown_error_notify_callbacks();
 void zend_error_notify_all_callbacks(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
-void zend_error_notify_callbacks_apply(llist_apply_func_t callback);
 #if ZEND_DEBUG
 void report_zend_debug_error_notify_cb(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
 #endif

main/main.c

@@ -2149,7 +2149,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	zend_update_current_locale();
 
 #if ZEND_DEBUG
-	zend_register_error_notify_callback("report_zend_debug", report_zend_debug_error_notify_cb);
+	zend_register_error_notify_callback(report_zend_debug_error_notify_cb);
 #endif
 
 #if HAVE_TZSET