- Whitespace changes to be standard like the rest of Zend

diff --git a/Zend/zend.h b/Zend/zend.h
index 9e5c6d949037bf58ccee5b01bb52b1ed808761b0..4c9466620206dc7ed203dc9352da66a0934ac8b2 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -433,7 +433,7 @@ ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval
        refcount = (*ppzv_dest)->refcount;                      \
        zval_dtor(*ppzv_dest);                                          \
        **ppzv_dest = *pzv_src;                                         \
-       if(copy) {                                  \
+       if (copy) {                                  \
                zval_copy_ctor(*ppzv_dest);                             \
     }                                              \
        (*ppzv_dest)->is_ref = is_ref;                          \

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 8aada64e603a2912b562458a67a33471a81f9832..fc2a3098a409907a186b5550a62d715c858efd84 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -482,7 +482,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
                }
        }
 
-       if(clean_cache) {
+       if (clean_cache) {
                for (i=1; i<MAX_CACHED_MEMORY; i++) {
                        for (j=0; j<AG(cache_count)[i]; j++) {
                                free(AG(cache)[i][j]);

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index b9713919e6c5c111bb657f76284c3da5c9d9dc55..0f7052f2068393bc5d9e473a6cc1cdec4c0ef064 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -418,7 +418,7 @@ ZEND_FUNCTION(define)
        c.flags = case_sensitive; /* non persistent */
        c.name = zend_strndup((*var)->value.str.val, (*var)->value.str.len);
        c.name_len = (*var)->value.str.len+1;
-       if(zend_register_constant(&c ELS_CC) == SUCCESS) {
+       if (zend_register_constant(&c ELS_CC) == SUCCESS) {
          RETURN_TRUE;
        } else {
          RETURN_FALSE;
@@ -627,7 +627,7 @@ ZEND_FUNCTION(method_exists)
        convert_to_string_ex(method_name);
        lcname = estrndup((*method_name)->value.str.val, (*method_name)->value.str.len);
        zend_str_tolower(lcname, (*method_name)->value.str.len);
-       if(zend_hash_exists(&(*klass)->value.obj.ce->function_table, lcname, (*method_name)->value.str.len+1)) {
+       if (zend_hash_exists(&(*klass)->value.obj.ce->function_table, lcname, (*method_name)->value.str.len+1)) {
                efree(lcname);
                RETURN_TRUE;
        } else {

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 85a2a12e92ac3627d43fcad66bab2e3de40deebf..5a71c660c1c6dbdd63c5ffdfd5212ba459729351 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -644,7 +644,7 @@ static unsigned __stdcall timeout_thread_proc(void *pArgs)
        wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
        wc.lpszMenuName=NULL;
        wc.lpszClassName = "Zend Timeout Window";
-       if(!RegisterClass(&wc)) {
+       if (!RegisterClass(&wc)) {
                return -1;
        }
        timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);

diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index b5c0ee365470b648cd5d3db2095105ce96fc2d08..790490fa00ed4928e05d02de0a0af3ee4e6d5e57 100644 (file)
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -49,7 +49,7 @@ int zend_load_extension(char *path)
 
 
        /* allow extension to proclaim compatibility with any Zend version */
-       if(extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
+       if (extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
                if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
                        fprintf(stderr, "%s requires Zend Engine API version %d\n"
                                        "The installed Zend Engine API version is %d\n\n",

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 6ce2a1a1ebb126e219dfaae9f90c138ec8979461..e7601599772b5f6203d60183dbfebdf385898a9d 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -304,7 +304,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
        CG(ZFL)->switch_streams(file_handle->handle.is, &cout);
 #endif
 
-       if(file_handle->opened_path) {
+       if (file_handle->opened_path) {
                file_path = file_handle->opened_path; 
        } else {
                file_path = file_handle->filename;
@@ -1011,7 +1011,7 @@ ANY_CHAR (.|[\n])
                zendlval->value.lval = LONG_MAX; /* maximal long */
                zend_error(E_NOTICE,"Hex number is too big: %s",yytext);
        } else {
-               if(zendlval->value.lval < 0) {
+               if (zendlval->value.lval < 0) {
                        /* maintain consistency with the old way */
                        zendlval->value.dval = (unsigned long) zendlval->value.lval;
                        zendlval->type = IS_DOUBLE;
@@ -1188,7 +1188,7 @@ ANY_CHAR (.|[\n])
 }
 
 <ST_ONE_LINE_COMMENT>"?>"|"%>" {
-    if(CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
+    if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
                zendlval->value.str.val = yytext; /* no copying - intentional */
                zendlval->value.str.len = yyleng;
                zendlval->type = IS_STRING;