[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c phar.phar phar_object.c

[Greg Beaver]

cellog          Sun Aug 31 06:26:19 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   func_interceptors.c phar.phar phar_object.c 
  Log:
  use %u instead of %d, merge from pecl/phar
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.16&r2=1.20.2.17&diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.16 
php-src/ext/phar/func_interceptors.c:1.20.2.17
--- php-src/ext/phar/func_interceptors.c:1.20.2.16      Sun Aug 31 06:05:20 2008
+++ php-src/ext/phar/func_interceptors.c        Sun Aug 31 06:26:19 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.16 2008/08/31 06:05:20 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.17 2008/08/31 06:26:19 cellog Exp $ */
 
 #include "phar_internal.h"
 
@@ -517,7 +517,7 @@
                case S_IFDIR: RETURN_STRING("dir", 1);
                case S_IFREG: RETURN_STRING("file", 1);
                }
-               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown file type 
(%d)", stat_sb->st_mode & S_IFMT);
+               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown file type 
(%u)", stat_sb->st_mode & S_IFMT);
                RETURN_STRING("unknown", 1);
        case FS_IS_W:
                RETURN_BOOL((stat_sb->st_mode & wmask) != 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.35&r2=1.7.2.36&diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.35 php-src/ext/phar/phar.phar:1.7.2.36
--- php-src/ext/phar/phar.phar:1.7.2.35 Sun Aug 31 06:13:42 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:26:19 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>
-6
-+6
+ 
ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹
 gߜ×
 „ób„náNŸ@@ -1229,4 +1229,4 @@
 ùU™NøÖ        [EMAIL PROTECTED]"[EMAIL PROTECTED]     
¬ËaYšº
[Ã⎬mòvOë<ý]¸¹)×soS…jßZæ/]ûô‚Þv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ŒÐӛ*€Çê=KÕO)ò)‘«Ë-ԍ]µLí‹·¡7µ¾Í¨.î
Ÿšzÿ.jß?8Tù®,˜:«Äa·éï¤Á»hg•
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4ʃ¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑ藵ïtúÎþ®øÚ÷Eí»ú¡ÃÏà›Ÿ‚ÇGx‰îӟ᧾óãæ]Ž¢Õ~f–I|øðP› 
j„7l1ØÛPšH†üéÅiGH¬5´¯’$ß/rªýëІ~ѐ›úgìªz²¢ÎÛ¦pu€Šùäûù;â9³™䂯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.39&r2=1.266.2.40&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.39 
php-src/ext/phar/phar_object.c:1.266.2.40
--- php-src/ext/phar/phar_object.c:1.266.2.39   Fri Aug  1 13:48:44 2008
+++ php-src/ext/phar/phar_object.c      Sun Aug 31 06:26:19 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar_object.c,v 1.266.2.39 2008/08/01 13:48:44 sfox Exp $ */
+/* $Id: phar_object.c,v 1.266.2.40 2008/08/31 06:26:19 cellog Exp $ */
 
 #include "phar_internal.h"
 #include "func_interceptors.h"
@@ -203,7 +203,7 @@
                        ctr.line_len = spprintf(&(ctr.line), 0, "Content-type: 
%s", mime_type);
                        sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
                        efree(ctr.line);
-                       ctr.line_len = spprintf(&(ctr.line), 0, 
"Content-length: %d", info->uncompressed_filesize);
+                       ctr.line_len = spprintf(&(ctr.line), 0, 
"Content-length: %u", info->uncompressed_filesize);
                        sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
                        efree(ctr.line);
 
@@ -2986,7 +2986,7 @@
                                add_assoc_stringl(return_value, "hash_type", 
"OpenSSL", 7, 1);
                                break;
                        default:
-                               unknown_len = spprintf(&unknown, 0, "Unknown 
(%d)", phar_obj->arc.archive->sig_flags);
+                               unknown_len = spprintf(&unknown, 0, "Unknown 
(%u)", phar_obj->arc.archive->sig_flags);
                                add_assoc_stringl(return_value, "hash_type", 
unknown, unknown_len, 0);
                                break;
                }



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