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

[Marcus Boerger]

helly           Sat Jan 20 12:22:02 2007 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  - Fix warnings
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.129&r2=1.130&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.129 php-src/ext/date/php_date.c:1.130
--- php-src/ext/date/php_date.c:1.129   Thu Jan 18 23:17:49 2007
+++ php-src/ext/date/php_date.c Sat Jan 20 12:22:02 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.129 2007/01/18 23:17:49 helly Exp $ */
+/* $Id: php_date.c,v 1.130 2007/01/20 12:22:02 helly Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -744,7 +744,7 @@
                status = U_ZERO_ERROR;                                          
       \
                j = udat_getSymbols(fmt, (type), i, array[i], 15, &status);     
       \
                                                                                
       \
-               tmp->var[i + (cor)] = array[i];                                 
       \
+               tmp->var[i + (cor)] = (char*)array[i];                          
       \
        }
 
 static php_locale_data* date_get_locale_data(char *locale)
@@ -754,7 +754,7 @@
        UErrorCode status = 0;
        int32_t count, i, j;
        UChar *array[15];
-       UChar *pat = sLongPat;
+       UChar *pat = (UChar*)sLongPat;
        int32_t len = 9;
 
        fmt = udat_open(UDAT_IGNORE,UDAT_IGNORE, locale, NULL, 0, pat, len, 
&status);
@@ -794,7 +794,7 @@
        va_start(ap, format);
 
        if (UG(unicode)) {
-               c = vuspprintf(str, size, format, ap) * 2;
+               c = vuspprintf((UChar**)str, size, format, ap) * sizeof(UChar);
        } else {
                c = vspprintf(str, size, format, ap);
        }
@@ -821,7 +821,7 @@
 
        if (!format_len) {
                if (UG(unicode)) {
-                       return eustrdup(EMPTY_STR);
+                       return (char*)eustrdup(EMPTY_STR);
                } else {                
                        return estrdup("");
                }
@@ -977,7 +977,7 @@
        string = php_format_date(format, format_len, ts, localtime TSRMLS_CC);
 
        if (UG(unicode)) {
-               RETVAL_UNICODE(string, 0);
+               RETVAL_UNICODE((UChar*)string, 0);
        } else {
                RETVAL_STRING(string, 0);
        }

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