noet

diff --git a/ext/xslt/sablot.c b/ext/xslt/sablot.c
index 79beef8b2d5acf9108c77d295d39c5a8dfb264cd..c6498f600e89d6e8d59b480156a4a2d4b118ffde 100644 (file)
--- a/ext/xslt/sablot.c
+++ b/ext/xslt/sablot.c
@@ -128,9 +128,9 @@ static SAXHandler sax_handlers =
 
 /* Error handlers, automatically registered */
 static MessageHandler message_handler = {
-    error_makecode,
-    error_log,
-    error_print
+       error_makecode,
+       error_log,
+       error_print
 };
 
 /* Scheme handlers automatically registered */
@@ -1323,7 +1323,6 @@ static MH_ERROR error_log(void *user_data, SablotHandle proc, MH_ERROR code, MH_
                        fields++;
                }
        }
-
        
        /* If no error line is given, then place none in the 
           file */
@@ -1560,6 +1559,6 @@ static MH_ERROR error_print(void *user_data, SablotHandle proc, MH_ERROR code, M
  * tab-width: 4
  * c-basic-offset: 4
  * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: noet sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: noet sw=4 ts=4 tw=78
  */

diff --git a/ext/xslt/xslt.c b/ext/xslt/xslt.c
index 54e6e8571424cccb8e5cfb4c09b4b95602562a0e..2a79d82f27b2bad980f599448ac8ab317161f7a2 100644 (file)
--- a/ext/xslt/xslt.c
+++ b/ext/xslt/xslt.c
@@ -29,25 +29,25 @@
 #include <string.h>
 #include <stdarg.h>
 
-static int debug = 0;
+#define XSLT_DEBUG 0
 
 /* {{{ xslt_debug() 
    Output a debug message if debugging is enabled */
 extern void xslt_debug(char *function_name, char *format, ...)
 {
-       if (debug) {
-               va_list argv;
-               char    buffer[1024];
+#if DEBUG
+       va_list argv;
+       char    buffer[1024];
 
-               va_start(argv, format);
-               vsnprintf(buffer, sizeof(buffer) - 1, format, argv);
-               va_end(argv);
+    va_start(argv, format);
+       vsnprintf(buffer, sizeof(buffer) - 1, format, argv);
+    va_end(argv);
 
-               buffer[sizeof(buffer) - 1] = '\0';
+       buffer[sizeof(buffer) - 1] = '\0';
 
-               php_printf("<b>XSLT Debug</b>: %s: %s<br>\n", 
-                          function_name, buffer);
-       }
+       php_printf("<b>XSLT Debug</b>: %s: %s<br>\n", 
+                  function_name, buffer);
+#endif
 }
 /* }}} */
 
@@ -58,16 +58,19 @@ static char *_find_xslt_argument(const char **argv, const char *key)
        char  **ptr;                  /* Pointer to the passed char ** array */
        char   *return_value = NULL;  /* Value to return from the function */
 
+    if (! argv)
+        return;
+    
        /* Loop through the array searching for the value */
        ptr = (char **) argv;
-       while (ptr && *ptr) {
+       while (*ptr) {
                /* If we have a match, save the value and exit out */
                if (! strcmp(*ptr, key)) {
                        return_value = estrdup(*ptr);
                        break;
                }
 
-               ptr++;
+               ++ptr;
        }
 
        return return_value;
@@ -91,7 +94,7 @@ extern void xslt_make_array(zval **zarr, char ***carr)
        }
 
        *carr = emalloc(((zend_hash_num_elements(arr) * 2) + 1) * sizeof(char *));
-       
+
        for (zend_hash_internal_pointer_reset(arr);
             zend_hash_get_current_data(arr, (void **) &current) == SUCCESS;
             zend_hash_move_forward(arr)) {
@@ -252,6 +255,6 @@ extern void xslt_call_function(char *name,
  * tab-width: 4
  * c-basic-offset: 4
  * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: noet sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: noet sw=4 ts=4 tw=78
  */