[PHP-CVS] cvs: php-src /ext/date php_date.c

[Derick Rethans]

derick          Tue Jan 29 20:12:23 2008 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  - Make whitespace the same as in 5.3.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.162&r2=1.163&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.162 php-src/ext/date/php_date.c:1.163
--- php-src/ext/date/php_date.c:1.162   Mon Jan 28 21:12:24 2008
+++ php-src/ext/date/php_date.c Tue Jan 29 20:12:23 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.162 2008/01/28 21:12:24 derick Exp $ */
+/* $Id: php_date.c,v 1.163 2008/01/29 20:12:23 derick Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -205,7 +205,6 @@
        {NULL, NULL, NULL}
 };
 
-
 const zend_function_entry date_funcs_date[] = {
        PHP_ME(DateTime,            __construct,       NULL, 
ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
        PHP_ME_MAPPING(createFromFormat, date_create_from_format,       NULL, 
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -233,8 +232,8 @@
        {NULL, NULL, NULL}
 };
 
-static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
 static void date_register_classes(TSRMLS_D);
+static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
 /* }}} */
 
 ZEND_DECLARE_MODULE_GLOBALS(date)
@@ -494,9 +493,7 @@
 PHP_MINIT_FUNCTION(date)
 {
        REGISTER_INI_ENTRIES();
-
        date_register_classes(TSRMLS_C);
-
 /*
  * RFC4287, Section 3.3: http://www.ietf.org/rfc/rfc4287.txt
  *   A Date construct is an element whose content MUST conform to the
@@ -1196,7 +1193,7 @@
 
        ret = php_idate(format[0], ts, 0);
        if (ret == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date 
format token");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date 
format token.");
                RETURN_FALSE;
        }
        RETURN_LONG(ret);
@@ -1291,7 +1288,7 @@
                timelib_tzinfo_dtor(t->tz_info);
        }
 
-       timelib_time_dtor(now); 
+       timelib_time_dtor(now);
        timelib_time_dtor(t);
 
        if (error1 || error2) {
@@ -1514,7 +1511,6 @@
                } else {
                        RETURN_STRINGL(buf, real_len, 0);
                }
-
        }
        efree(buf);
        RETURN_FALSE;
@@ -1945,7 +1941,7 @@
 
        dateobj->time->have_weekday_relative = dateobj->time->have_relative = 0;
 
-       if (type == TIMELIB_ZONETYPE_ID && now->tz_info != tzi) {
+       if (type == TIMELIB_ZONETYPE_ID && now->tz_info != tzi) {
                timelib_tzinfo_dtor(now->tz_info);
        }
        if (free_tzi) {
@@ -2074,7 +2070,7 @@
                add_ascii_assoc_double(return_value, "fraction", 
parsed_time->f);
        }
 
-       zval_from_error_container(return_value, error);
+       zval_from_error_container(return_value, error);
 
        timelib_error_container_dtor(error);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php