diff options
author | Steph Fox <sfox@php.net> | 2008-05-13 18:35:25 +0000 |
---|---|---|
committer | Steph Fox <sfox@php.net> | 2008-05-13 18:35:25 +0000 |
commit | 247d91e7805aba44803818b4b8fadb2199ab0be8 (patch) | |
tree | e5bb698ecec3e6565fc31c6d20ca5afe35da0bfc /ext/phar/util.c | |
parent | 461006fa97d787d9b10963cdd059524baec4c863 (diff) | |
download | php-git-247d91e7805aba44803818b4b8fadb2199ab0be8.tar.gz |
- 'It builds on my box'.
- Don't expect any tests to pass.
Diffstat (limited to 'ext/phar/util.c')
-rw-r--r-- | ext/phar/util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 77e83098a4..0b3bf48aa3 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1183,7 +1183,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in } return entry; } else if (phar->mounted_dirs.arBuckets && zend_hash_num_elements(&phar->mounted_dirs)) { - char *key; + zstr key; ulong unused; uint keylen; @@ -1192,7 +1192,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in if (HASH_KEY_NON_EXISTANT == zend_hash_get_current_key_ex(&phar->mounted_dirs, &key, &keylen, &unused, 0, NULL)) { break; } - if ((int)keylen >= path_len || strncmp(key, path, keylen)) { + if ((int)keylen >= path_len || strncmp(key.s, path, keylen)) { continue; } else { char *test; @@ -1200,15 +1200,15 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in phar_entry_info *entry; php_stream_statbuf ssb; - if (SUCCESS != zend_hash_find(&phar->manifest, key, keylen, (void **) &entry)) { + if (SUCCESS != zend_hash_find(&phar->manifest, key.s, keylen, (void **) &entry)) { if (error) { - spprintf(error, 4096, "phar internal error: mounted path \"%s\" could not be retrieved from manifest", key); + spprintf(error, 4096, "phar internal error: mounted path \"%s\" could not be retrieved from manifest", key.s); } return NULL; } if (!entry->tmp || !entry->is_mounted) { if (error) { - spprintf(error, 4096, "phar internal error: mounted path \"%s\" is not properly initialized as a mounted path", key); + spprintf(error, 4096, "phar internal error: mounted path \"%s\" is not properly initialized as a mounted path", key.s); } return NULL; } @@ -1254,7 +1254,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in if (dir) { /* try to find a directory */ HashTable *manifest; - char *key; + zstr key; uint keylen; ulong unused; @@ -1267,14 +1267,14 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in if (HASH_KEY_NON_EXISTANT == zend_hash_get_current_key_ex(manifest, &key, &keylen, &unused, 0, NULL)) { break; } - if (0 != memcmp(key, path, path_len)) { + if (0 != memcmp(key.s, path, path_len)) { /* entry in directory not found */ if (SUCCESS != zend_hash_move_forward(manifest)) { break; } continue; } else { - if (key[path_len] != '/') { + if (key.s[path_len] != '/') { if (SUCCESS != zend_hash_move_forward(manifest)) { break; } |