cvs: php4 /main fopen_wrappers.h php_network.h

wez Sun Mar 17 08:29:44 2002 EDT Modified files: /php4/main fopen_wrappers.h php_network.h Log: tidy up the headers (streams related) Index: php4/main/fopen_wrappers.h diff -u php4/main/fopen_wrappers.h:1.34 php4/main/fopen_wrappers.h:1.35 --- php4/main/fopen_wrappers.h:1.34 Fri Mar 15 16:03:07 2002 +++ php4/main/fopen_wrappers.h Sun Mar 17 08:29:44 2002 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.h,v 1.34 2002/03/15 21:03:07 wez Exp $ */ +/* $Id: fopen_wrappers.h,v 1.35 2002/03/17 13:29:44 wez Exp $ */ #ifndef FOPEN_WRAPPERS_H #define FOPEN_WRAPPERS_H @@ -26,34 +26,15 @@ #define USE_PATH 1 #define IGNORE_URL 2 /* There's no USE_URL. */ -#ifdef PHP_WIN32 -# define IGNORE_URL_WIN IGNORE_URL -#else -# define IGNORE_URL_WIN 0 -#endif #define ENFORCE_SAFE_MODE 4 - #define REPORT_ERRORS 8 #ifdef PHP_WIN32 -# define SOCK_ERR INVALID_SOCKET -# define SOCK_CONN_ERR SOCKET_ERROR -# define SOCK_RECV_ERR SOCKET_ERROR +# define IGNORE_URL_WIN IGNORE_URL #else -# define SOCK_ERR -1 -# define SOCK_CONN_ERR -1 -# define SOCK_RECV_ERR -1 +# define IGNORE_URL_WIN 0 #endif -/* values for issock */ -#define IS_NOT_SOCKET 0 -#define IS_SOCKET 1 -#define BAD_URL 2 - -typedef FILE *(*php_fopen_url_wrapper_t)(const char *, char *, int, int *, int *, char ** TSRMLS_DC); - -PHPAPI FILE *php_fopen_wrapper(char *filename, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC); - PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC); PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC); @@ -66,12 +47,6 @@ PHPAPI int php_is_url(char *path); PHPAPI char *php_strip_url_passwd(char *path); - - -int php_init_fopen_wrappers(TSRMLS_D); -int php_shutdown_fopen_wrappers(TSRMLS_D); -PHPAPI int php_register_url_wrapper(const char *protocol, php_fopen_url_wrapper_t wrapper TSRMLS_DC); -PHPAPI int php_unregister_url_wrapper(char *protocol TSRMLS_DC); #endif /* Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.16 php4/main/php_network.h:1.17 --- php4/main/php_network.h:1.16 Sun Mar 17 08:19:27 2002 +++ php4/main/php_network.h Sun Mar 17 08:29:44 2002 @@ -15,7 +15,7 @@ | Author: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.16 2002/03/17 13:19:27 wez Exp $ */ +/* $Id: php_network.h,v 1.17 2002/03/17 13:29:44 wez Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -61,6 +61,16 @@ #ifdef HAVE_STDDEF_H #include <stddef.h> +#endif + +#ifdef PHP_WIN32 +# define SOCK_ERR INVALID_SOCKET +# define SOCK_CONN_ERR SOCKET_ERROR +# define SOCK_RECV_ERR SOCKET_ERROR +#else +# define SOCK_ERR -1 +# define SOCK_CONN_ERR -1 +# define SOCK_RECV_ERR -1 #endif #ifdef HAVE_SOCKADDR_STORAGE