summaryrefslogtreecommitdiff
path: root/ext/ftp/php_ftp.c
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>1999-10-15 15:22:25 +0000
committerThies C. Arntzen <thies@php.net>1999-10-15 15:22:25 +0000
commitb5c3c7bfc908f4e9f841db2ce2e20c6b4cee9d32 (patch)
tree079096896d215713e74b139203b0295a9df25b4b /ext/ftp/php_ftp.c
parentd69d118cbd401dfdc1766256347a52f0aaf724ca (diff)
downloadphp-git-b5c3c7bfc908f4e9f841db2ce2e20c6b4cee9d32.tar.gz
files are now resources, file.c is thread-safe, the le_ vars are no longer shared,
but they are accessible thru "php_file_le_socket(), php_file_le_uploads()..." i also updated the ftp, pdf and file-upload stuff to match the new requirements. @- Cleaned up File-Module (Thies)
Diffstat (limited to 'ext/ftp/php_ftp.c')
-rw-r--r--ext/ftp/php_ftp.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 07f8ff59a6..e8b34c60c4 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -132,16 +132,7 @@ PHP_MINIT_FUNCTION(ftp)
}
#define FILEP(fp, pval) { \
- int id, type; \
- int le_fp; \
- le_fp = php3i_get_le_fp(); \
- convert_to_long(pval); \
- id = (pval)->value.lval; \
- (fp) = php3_list_find(id, &type); \
- if (!(fp) || type != le_fp) { \
- php_error(E_WARNING, "Unable to find fp %d", id); \
- RETURN_FALSE; \
- } \
+ ZEND_FETCH_RESOURCE(fp, FILE *, &pval, -1, "File-Handle", php_file_le_fopen()); \
}
/* {{{ proto int ftp_connect(string host [, int port])