php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 04:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

We don't need to store NUL of the key which simplifies the lookup

Browse Source 
significantly.
This commit is contained in:
Sascha Schumann
2000-10-22 14:42:55 +00:00
parent f69a4a431a
commit 61cf1f34a5
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/fopen_wrappers.c
View File

@@ -91,7 +91,7 @@ PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(char *path
PLS_FETCH();
if(PG(allow_url_fopen)) {
return zend_hash_add(&fopen_url_wrappers_hash, protocol, strlen(protocol)+1, &wrapper, sizeof(wrapper), NULL);
return zend_hash_add(&fopen_url_wrappers_hash, protocol, strlen(protocol), &wrapper, sizeof(wrapper), NULL);
} else {
return FAILURE;
}
@@ -102,7 +102,7 @@ PHPAPI int php_unregister_url_wrapper(char *protocol)
PLS_FETCH();
if(PG(allow_url_fopen)) {
return zend_hash_del(&fopen_url_wrappers_hash, protocol, strlen(protocol)+1);
return zend_hash_del(&fopen_url_wrappers_hash, protocol, strlen(protocol));
} else {
return SUCCESS;
}
@@ -439,16 +439,10 @@ static FILE *php_fopen_url_wrapper(const char *path, char *mode, int options, in
if(protocol) {
php_fopen_url_wrapper_t *wrapper=NULL;
char *protocopy = emalloc(n+1);
if(protocopy) {
strncpy(protocopy,protocol,n);
protocopy[n]='\0';
if(FAILURE==zend_hash_find(&fopen_url_wrappers_hash, protocopy, n+1,(void **)&wrapper)) {
wrapper=NULL;
protocol=NULL;
}
efree(protocopy);
if(FAILURE==zend_hash_find(&fopen_url_wrappers_hash, protocol, n, (void **)&wrapper)) {
wrapper=NULL;
protocol=NULL;
}
if(wrapper)
return (*wrapper)(path, mode, options, issock, socketd, opened_path);