]> granicus.if.org Git - php/commitdiff
- ws, typo fix
authorSteph Fox <sfox@php.net>
Sun, 22 Jun 2008 13:10:03 +0000 (13:10 +0000)
committerSteph Fox <sfox@php.net>
Sun, 22 Jun 2008 13:10:03 +0000 (13:10 +0000)
ext/phar/phar_object.c
ext/phar/util.c

index c0a7aef2583e560a92a3eba82e4109055712c4b6..25ff33702acf1410b3273b0961cd88030f82db16 100755 (executable)
@@ -1372,14 +1372,15 @@ PHP_METHOD(Phar, unlinkArchive)
        }
 
 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 @@ PHP_METHOD(Phar, buildFromIterator)
        uint base_len = 0;
        char *base = NULL;
        struct _phar_t pass;
+
        PHAR_ARCHIVE_OBJECT();
 
        if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
index 2f9e9e3df15e0a0c5b11bd5ef1fd4f428eac6fb2..4ea546097a97401feee76e771dc2989cb9e71e2a 100644 (file)
@@ -356,7 +356,7 @@ splitted:
                                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);