X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ferror.c;h=46972f5cb660601923d82f58e6580ac89117bcdf;hp=48a41ac2481dc99042da0d8540eb4503b7f1b1ee;hb=0682ecb84dfe1de08b609c6c0ae641b06f3fa481;hpb=d4bd55e7d9b1cf63cd6fdc96b70010a0c2aca963

diff --git a/src/error.c b/src/error.c
index 48a41ac..46972f5 100644
--- a/src/error.c
+++ b/src/error.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "data.h"
 
 /* zend_error_cb */
@@ -71,15 +75,17 @@ void psi_error_wrapper(struct psi_data *context, struct psi_token *t, int type,
 
 	va_start(argv, msg);
 	psi_verror(type, fn, ln, msg, argv);
-#ifdef __clang__
 	va_end(argv);
+
 	va_start(argv, msg);
-#endif
-	PSI_DEBUG_PRINTV(context, msg, argv);
+	PSI_DEBUG_LOCK(context,
+			PSI_DEBUG_PRINTV(context, msg, argv);
+			PSI_DEBUG_PRINT(context, "\n");
+	);
 	va_end(argv);
 
 	if (context) {
-		strlcpy(context->last_error, PG(last_error_message),
+		strlcpy(context->last_error, PG(last_error_message)->val,
 				sizeof(context->last_error));
 	}
 }
@@ -95,5 +101,7 @@ void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
 
 void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
 {
-	zend_error_cb(type, fn, ln, msg, argv);
+	zend_string *message = zend_vstrpprintf(0, msg, argv);
+	zend_error_cb(type, fn, ln, message);
+	zend_string_release(message);
 }