X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=abe1ff64c79ade60197d11f26d34c2b462976f8f;hp=d1f808cb19512d076f90b4b024325d64ca25a9a8;hb=9aeae2c241e303c537d8be18dd6c9f8776b2f044;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e

diff --git a/src/context.c b/src/context.c
index d1f808c..abe1ff6 100644
--- a/src/context.c
+++ b/src/context.c
@@ -168,8 +168,7 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 {
 	zend_constant zc;
 
-	zc.flags = CONST_PERSISTENT|CONST_CS;
-	zc.module_number = EG(current_module)->module_number;
+	ZEND_CONSTANT_SET_FLAGS(&zc, CONST_CS|CONST_PERSISTENT, EG(current_module)->module_number);
 
 	if (C->consts) {
 		size_t i = 0;
@@ -324,8 +323,13 @@ void psi_context_free(struct psi_context **C)
 
 void psi_context_dump(struct psi_context *C, int fd)
 {
-	dprintf(fd, "// psi.engine=%s\n",
-			(char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL));
+	size_t i;
+
+	dprintf(fd, "// psi.engine=%s\n// %lu files\n",
+			(char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL),
+			C->count);
 
-	psi_data_dump(fd, PSI_DATA(C));
+	for (i = 0; i < C->count; ++i) {
+		psi_data_dump(fd, &C->data[i]);
+	}
 }