From: Marcus Boerger <helly@php.net>
Date: Sat, 13 Aug 2005 01:31:14 +0000 (+0000)
Subject: - Unicode
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c14b0169a1c3a2e033d207dbe80bc92621b2f49;p=php

- Unicode
# We probably might want to move spprintf.c/h into Zend now
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index c167474260..29a90aa6f0 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -448,7 +448,7 @@ ZEND_METHOD(exception, getTraceAsString)
 }
 /* }}} */
 
-static int zend_spprintf(char **message, int max_len, char *format, ...)
+int zend_spprintf(char **message, int max_len, char *format, ...)
 {
 	va_list arg;
 	int len;
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 56823cccdf..ce19bbca04 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -29,6 +29,8 @@
 
 #include "zend_vm.h"
 
+extern int zend_spprintf(char **message, int max_len, char *format, ...);
+
 static void zend_extension_op_array_ctor_handler(zend_extension *extension, zend_op_array *op_array TSRMLS_DC)
 {
 	if (extension->op_array_ctor) {
@@ -386,10 +388,15 @@ int pass_two(zend_op_array *op_array TSRMLS_DC)
 
 int print_class(zend_class_entry *class_entry TSRMLS_DC)
 {
-	/* UTODO: fix these to use spprintf() */
-	printf("Class %v:\n", class_entry->name);
+	char *tmp;
+
+	zend_spprintf(&tmp, 0, "Class %v:\n", class_entry->name);
+	printf("%s", tmp);
+	efree(tmp);
 	zend_hash_apply(&class_entry->function_table, (apply_func_t) pass_two TSRMLS_CC);
-	printf("End of class %v.\n\n", class_entry->name);
+	zend_spprintf(&tmp, 0, "End of class %v.\n\n", class_entry->name);
+	printf("%s", tmp);
+	efree(tmp);
 	return 0;
 }