Changeset 8

Timestamp:

07/25/04 14:49:50 (9 years ago)

Author:

george

Message:

make error handling more php5 esque

Files:

• trunk/fastxsl.c (modified) (8 diffs)
• trunk/php_fastxsl.h (modified) (1 diff)

trunk/fastxsl.c

@@ -58 +58 @@
-#define FASTXSL_SHARED_ALLOC 2
-
+void fastxsl_errorfunc(void *ctx, const char *msg, ...);
+
-static php_ss_wrapper *
-SS_Wrapper_Alloc(int shared TSRMLS_DC)
@@ -380 +382 @@
-
-        wrapper = (php_ss_wrapper *) SS_Wrapper_Alloc(0 TSRMLS_CC);
-(const xmlChar *) 
+
-        if (!wrapper->ss) {
-                RETURN_FALSE;
@@ -547 +549 @@
-        }
-
+        wrapper = (php_ss_wrapper *) SS_Wrapper_Alloc(0 TSRMLS_CC);
-        result_wrapper->xd = xsltApplyStylesheet(ss_wrapper->ss, xd_wrapper->xd, 
-                        (const char **) parameters);
@@ -902 +905 @@
-                xmlFreeDoc(wrapper->xd);
-        free(wrapper);
+}
+
+void fastxsl_errorfunc(void *ctx, const char *msg, ...)
+{
+        char *frag;
+        int fraglen;
+        int output = 0;
+        va_list args;
+        va_start(args, msg);
+        fraglen = vspprintf(&frag, 0, msg, args);
+        while(fraglen && frag[fraglen - 1] == '\n') {
+                frag[--fraglen] = '\0';
+                output = 1;
+        }
+        if(fraglen) {
+                if(FASTXSL_G(errbuf)) {
+                        FASTXSL_G(errbuf) = erealloc(FASTXSL_G(errbuf), fraglen + strlen(FASTXSL_G(errbuf)));
+                        strcat(FASTXSL_G(errbuf), frag);
+                } else {
+                        FASTXSL_G(errbuf) = frag;
+                }
+        }
+        va_end(args);
+        if(output) {
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, FASTXSL_G(errbuf));
+                efree(FASTXSL_G(errbuf));
+                FASTXSL_G(errbuf) = NULL;
+        }
-}
-
@@ -1030 +1061 @@
-        fname = xmlXPathPopString(ctxt);
-        if(!fname) {
-Debug
+Error
-                        "passed function name is not a string");
-                xmlXPathReturnEmptyString(ctxt);
@@ -1042 +1073 @@
-        if(call_user_function(EG(function_table), NULL, function, ret, 
-                                 param_count, params TSRMLS_CC) == FAILURE) {
-Debug
+Error
-                                "function evaluation error");
-                xmlXPathReturnEmptyString(ctxt);
@@ -1096 +1127 @@
-
-        ZEND_INIT_MODULE_GLOBALS(fastxsl, php_fastxsl_init_globals, php_fastxsl_destroy_globals);
-
+
-        REGISTER_INI_ENTRIES();
-        
@@ -1111 +1142 @@
-        xmlRegisterOutputCallbacks(Stream_MatchWrapper, Stream_XmlWrite_OpenWrapper, 
-                                           Stream_XmlWrite_WriteWrapper, Stream_CloseWrapper);
-
+
+
-#ifdef FASTXSL_MM
-        if (!sprintf(euid, "%d", geteuid())) {

trunk/php_fastxsl.h

@@ -84 +84 @@
-        fl_cache *cache;
-        char     *shmpath;
+        char     *errbuf;
-        long      nostat;
-        long      register_functions;