fix folding

diff --git a/sapi/cli/getopt.c b/sapi/cli/getopt.c
index 4821a9c84dbadc11d994365a866d208735e97330..7e6419e674dea1d3618a7de74a5763cb3d91f084 100644 (file)
--- a/sapi/cli/getopt.c
+++ b/sapi/cli/getopt.c
@@ -28,7 +28,7 @@
 #define OPTERRARG (3)
 
 
-static int php_opt_error(int argc, char * const *argv, int oint, int optchr, int err, int show_err)
+static int php_opt_error(int argc, char * const *argv, int oint, int optchr, int err, int show_err) /* {{{ */
 {
        if (show_err)
        {
@@ -51,8 +51,9 @@ static int php_opt_error(int argc, char * const *argv, int oint, int optchr, int
        }
        return('?');
 }
+/* }}} */
 
-int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err)
+int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err) /* {{{ */
 {
        static int optchr = 0;
        static int dash = 0; /* have already seen the - */
@@ -162,3 +163,13 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
        assert(0);
        return(0);      /* never reached */
 }
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 66a7989b9d9a7dab33297dd10419527409913746..282aa932c7544b1cdefdfb8215da86f06f743e13 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -164,13 +164,14 @@ static const opt_struct OPTIONS[] = {
        {'-', 0, NULL} /* end of args */
 };
 
-static int print_module_info(zend_module_entry *module TSRMLS_DC)
+static int print_module_info(zend_module_entry *module TSRMLS_DC) /* {{{ */
 {
        php_printf("%s\n", module->name);
        return ZEND_HASH_APPLY_KEEP;
 }
+/* }}} */
 
-static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
+static int module_name_cmp(const void *a, const void *b TSRMLS_DC) /* {{{ */
 {
        Bucket *f = *((Bucket **) a);
        Bucket *s = *((Bucket **) b);
@@ -178,8 +179,9 @@ static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
        return strcasecmp(((zend_module_entry *)f->pData)->name,
                                  ((zend_module_entry *)s->pData)->name);
 }
+/* }}} */
 
-static void print_modules(TSRMLS_D)
+static void print_modules(TSRMLS_D) /* {{{ */
 {
        HashTable sorted_registry;
        zend_module_entry tmp;
@@ -190,21 +192,23 @@ static void print_modules(TSRMLS_D)
        zend_hash_apply(&sorted_registry, (apply_func_t) print_module_info TSRMLS_CC);
        zend_hash_destroy(&sorted_registry);
 }
+/* }}} */
 
-static int print_extension_info(zend_extension *ext, void *arg TSRMLS_DC)
+static int print_extension_info(zend_extension *ext, void *arg TSRMLS_DC) /* {{{ */
 {
        php_printf("%s\n", ext->name);
        return ZEND_HASH_APPLY_KEEP;
 }
+/* }}} */
 
-static int extension_name_cmp(const zend_llist_element **f,
-                                                         const zend_llist_element **s TSRMLS_DC)
+static int extension_name_cmp(const zend_llist_element **f, const zend_llist_element **s TSRMLS_DC) /* {{{ */
 {
        return strcmp(((zend_extension *)(*f)->data)->name,
                                  ((zend_extension *)(*s)->data)->name);
 }
+/* }}} */
 
-static void print_extensions(TSRMLS_D)
+static void print_extensions(TSRMLS_D) /* {{{ */
 {
        zend_llist sorted_exts;
 
@@ -214,12 +218,13 @@ static void print_extensions(TSRMLS_D)
        zend_llist_apply(&sorted_exts, (llist_apply_func_t) print_extension_info TSRMLS_CC);
        zend_llist_destroy(&sorted_exts);
 }
+/* }}} */
 
 #ifndef STDOUT_FILENO
 #define STDOUT_FILENO 1
 #endif
 
-static inline size_t sapi_cli_single_write(const char *str, uint str_length)
+static inline size_t sapi_cli_single_write(const char *str, uint str_length) /* {{{ */
 {
 #ifdef PHP_WRITE_STDOUT
        long ret;
@@ -236,8 +241,9 @@ static inline size_t sapi_cli_single_write(const char *str, uint str_length)
        return ret;
 #endif
 }
+/* }}} */
 
-static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC)
+static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{ */
 {
        const char *ptr = str;
        uint remaining = str_length;
@@ -266,9 +272,9 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC)
 
        return str_length;
 }
+/* }}} */
 
-
-static void sapi_cli_flush(void *server_context)
+static void sapi_cli_flush(void *server_context) /* {{{ */
 {
        /* Ignore EBADF here, it's caused by the fact that STDIN/STDOUT/STDERR streams
         * are/could be closed before fflush() is called.
@@ -279,11 +285,12 @@ static void sapi_cli_flush(void *server_context)
 #endif
        }
 }
+/* }}} */
 
 static char *php_self = "";
 static char *script_filename = "";
 
-static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC)
+static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{ */
 {
        /* In CGI mode, we consider the environment to be a part of the server
         * variables
@@ -299,14 +306,15 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC)
        /* just make it available */
        php_register_variable("DOCUMENT_ROOT", "", track_vars_array TSRMLS_CC);
 }
+/* }}} */
 
-
-static void sapi_cli_log_message(char *message)
+static void sapi_cli_log_message(char *message) /* {{{ */
 {
        fprintf(stderr, "%s\n", message);
 }
+/* }}} */
 
-static int sapi_cli_deactivate(TSRMLS_D)
+static int sapi_cli_deactivate(TSRMLS_D) /* {{{ */
 {
        fflush(stdout);
        if(SG(request_info).argv0) {
@@ -315,40 +323,44 @@ static int sapi_cli_deactivate(TSRMLS_D)
        }
        return SUCCESS;
 }
+/* }}} */
 
-static char* sapi_cli_read_cookies(TSRMLS_D)
+static char* sapi_cli_read_cookies(TSRMLS_D) /* {{{ */
 {
        return NULL;
 }
+/* }}} */
 
-static int sapi_cli_header_handler(sapi_header_struct *h, sapi_headers_struct *s TSRMLS_DC)
+static int sapi_cli_header_handler(sapi_header_struct *h, sapi_headers_struct *s TSRMLS_DC) /* {{{ */
 {
        /* free allocated header line */
        efree(h->header);
        /* avoid pushing headers into SAPI headers list */
        return 0;
 }
+/* }}} */
 
-static int sapi_cli_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
+static int sapi_cli_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) /* {{{ */
 {
        /* We do nothing here, this function is needed to prevent that the fallback
         * header handling is called. */
        return SAPI_HEADER_SENT_SUCCESSFULLY;
 }
+/* }}} */
 
-static void sapi_cli_send_header(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC)
+static void sapi_cli_send_header(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC) /* {{{ */
 {
 }
+/* }}} */
 
-
-static int php_cli_startup(sapi_module_struct *sapi_module)
+static int php_cli_startup(sapi_module_struct *sapi_module) /* {{{ */
 {
        if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
                return FAILURE;
        }
        return SUCCESS;
 }
-
+/* }}} */
 
 /* {{{ sapi_cli_ini_defaults */
 
@@ -468,7 +480,7 @@ static void php_cli_usage(char *argv0)
 
 static php_stream *s_in_process = NULL;
 
-static void cli_register_file_handles(TSRMLS_D)
+static void cli_register_file_handles(TSRMLS_D) /* {{{ */
 {
        zval *zin, *zout, *zerr;
        php_stream *s_in, *s_out, *s_err;
@@ -530,6 +542,7 @@ static void cli_register_file_handles(TSRMLS_D)
        FREE_ZVAL(zout);
        FREE_ZVAL(zerr);
 }
+/* }}} */
 
 static const char *param_mode_conflict = "Either execute direct code, process stdin or use a file.\n";
 

diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index 8d442a7d41c7deb19c05192d0d45cb911ff740db..fffc6d07f33d213620eaf50582f2ee98c905a3cf 100644 (file)
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -59,8 +59,6 @@
 #include "zend_highlight.h"
 #include "zend_indent.h"
 
-/* {{{ cli_is_valid_code
- */
 typedef enum {
        body,
        sstring,
@@ -74,7 +72,7 @@ typedef enum {
        outside,
 } php_code_type;
 
-int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC)
+int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) /* {{{ */
 {
        int valid_end = 1, last_valid_end;
        int brackets_count = 0;
@@ -430,9 +428,7 @@ TODO:
        return retval;
 } /* }}} */
 
-/* {{{ cli_code_completion
- */
-char **cli_code_completion(const char *text, int start, int end)
+char **cli_code_completion(const char *text, int start, int end) /* {{{ */
 {
        return rl_completion_matches(text, cli_completion_generator);
 }