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

[Steph Fox]

sfox            Sun Jun 22 13:10:03 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   phar_object.c util.c 
  Log:
  - ws, typo fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.28&r2=1.266.2.29&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.28 
php-src/ext/phar/phar_object.c:1.266.2.29
--- php-src/ext/phar/phar_object.c:1.266.2.28   Sat Jun 21 18:57:53 2008
+++ php-src/ext/phar/phar_object.c      Sun Jun 22 13:10:03 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar_object.c,v 1.266.2.28 2008/06/21 18:57:53 sfox Exp $ */
+/* $Id: phar_object.c,v 1.266.2.29 2008/06/22 13:10:03 sfox Exp $ */
 
 #include "phar_internal.h"
 #include "func_interceptors.h"
@@ -1372,14 +1372,15 @@
        }
 
 struct _phar_t {
-               phar_archive_object *p;
-               zend_class_entry *c;
-               char *b;
-               uint l;
-               zval *ret;
-               int count;
-               php_stream *fp;
-       };
+       phar_archive_object *p;
+       zend_class_entry *c;
+       char *b;
+       uint l;
+       zval *ret;
+       int count;
+       php_stream *fp;
+};
+
 static int phar_build(zend_object_iterator *iter, void *puser TSRMLS_DC) /* 
{{{ */
 {
        zval **value;
@@ -1764,6 +1765,7 @@
        uint base_len = 0;
        char *base = NULL;
        struct _phar_t pass;
+
        PHAR_ARCHIVE_OBJECT();
 
        if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.19&r2=1.55.2.20&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.19 php-src/ext/phar/util.c:1.55.2.20
--- php-src/ext/phar/util.c:1.55.2.19   Sat Jun 21 21:37:39 2008
+++ php-src/ext/phar/util.c     Sun Jun 22 13:10:03 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: util.c,v 1.55.2.19 2008/06/21 21:37:39 sfox Exp $ */
+/* $Id: util.c,v 1.55.2.20 2008/06/22 13:10:03 sfox Exp $ */
 
 #include "phar_internal.h"
 
@@ -356,7 +356,7 @@
                                return ret;
                        }
                } else {
-                       if (zend_hash_exists(&(phar)->manifest), test, 
try_len)) {
+                       if (zend_hash_exists(&(phar->manifest), test, try_len)) 
{
                                spprintf(&ret, 0, "phar://%s/%s", arch, test);
                                efree(arch);
                                efree(test);



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