Skip to content

Commit

Permalink
more *'s
Browse files Browse the repository at this point in the history
  • Loading branch information
@wez
wez committed Mar 16, 2002
1 parent bc264db commit 28d6981
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion main/main.c
View file
Expand Up @@ -564,7 +564,7 @@ PHP_FUNCTION(set_time_limit)
static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path)
{
FILE *retval = NULL;
php_stream * stream;
php_stream *stream;
TSRMLS_FETCH();

stream = php_stream_open_wrapper((char *)filename, "rb", USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS, opened_path TSRMLS_CC);
Expand Down
58 changes: 29 additions & 29 deletions main/network.c
View file
Expand Up @@ -411,10 +411,10 @@ int php_sockaddr_size(php_sockaddr_storage *addr)
}
/* }}} */

PHPAPI php_stream * php_stream_sock_open_from_socket(int socket, int persistent)
PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent)
{
php_stream * stream;
php_netstream_data_t * sock;
php_stream *stream;
php_netstream_data_t *sock;

sock = pemalloc(sizeof(php_netstream_data_t), persistent);
memset(sock, 0, sizeof(php_netstream_data_t));
Expand All @@ -432,7 +432,7 @@ PHPAPI php_stream * php_stream_sock_open_from_socket(int socket, int persistent)
return stream;
}

PHPAPI php_stream * php_stream_sock_open_host(const char * host, unsigned short port,
PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
int socktype, int timeout, int persistent)
{
int socket;
Expand All @@ -445,7 +445,7 @@ PHPAPI php_stream * php_stream_sock_open_host(const char * host, unsigned short
return php_stream_sock_open_from_socket(socket, persistent);
}

PHPAPI php_stream * php_stream_sock_open_unix(const char * path, int persistent, struct timeval * timeout)
PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent, struct timeval *timeout)
{
#if defined(AF_UNIX)
int socketd;
Expand All @@ -469,10 +469,10 @@ PHPAPI php_stream * php_stream_sock_open_unix(const char * path, int persistent,
}

#if HAVE_OPENSSL_EXT
PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream * stream, int activate, SSL_METHOD * method)
PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
SSL_CTX * ctx = NULL;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
SSL_CTX *ctx = NULL;

if (!php_stream_is(stream, PHP_STREAM_IS_SOCKET))
return FAILURE;
Expand Down Expand Up @@ -509,9 +509,9 @@ PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream * stream, int act
}
#endif

PHPAPI void php_stream_sock_set_timeout(php_stream * stream, struct timeval *timeout)
PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;

if (!php_stream_is(stream, PHP_STREAM_IS_SOCKET))
return;
Expand All @@ -520,10 +520,10 @@ PHPAPI void php_stream_sock_set_timeout(php_stream * stream, struct timeval *tim
sock->timeout_event = 0;
}

PHPAPI int php_stream_sock_set_blocking(php_stream * stream, int mode)
PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode)
{
int oldmode;
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;

if (!php_stream_is(stream, PHP_STREAM_IS_SOCKET))
return 0;
Expand All @@ -534,10 +534,10 @@ PHPAPI int php_stream_sock_set_blocking(php_stream * stream, int mode)
return oldmode;
}

PHPAPI size_t php_stream_sock_set_chunk_size(php_stream * stream, size_t size)
PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size)
{
size_t oldsize;
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;

if (!php_stream_is(stream, PHP_STREAM_IS_SOCKET))
return 0;
Expand All @@ -552,16 +552,16 @@ PHPAPI size_t php_stream_sock_set_chunk_size(php_stream * stream, size_t size)
#define READPTR(sock) ((sock)->readbuf + (sock)->readpos)
#define WRITEPTR(sock) ((sock)->readbuf + (sock)->writepos)

static size_t php_sockop_write(php_stream * stream, const char * buf, size_t count)
static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
#if HAVE_OPENSSL_EXT
if (sock->ssl_active)
return SSL_write(sock->ssl_handle, buf, count);
#endif
return send(sock->socket, buf, count, 0);
}
static void php_sock_stream_wait_for_data(php_stream * stream, php_netstream_data_t * sock)
static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data_t *sock)
{
fd_set fdr, tfdr;
int retval;
Expand Down Expand Up @@ -590,7 +590,7 @@ static void php_sock_stream_wait_for_data(php_stream * stream, php_netstream_dat
}
}

static size_t php_sock_stream_read_internal(php_stream * stream, php_netstream_data_t * sock)
static size_t php_sock_stream_read_internal(php_stream *stream, php_netstream_data_t *sock)
{
char buf[PHP_SOCK_CHUNK_SIZE];
int nr_bytes;
Expand Down Expand Up @@ -634,7 +634,7 @@ static size_t php_sock_stream_read_internal(php_stream * stream, php_netstream_d

}

static size_t php_sock_stream_read(php_stream * stream, php_netstream_data_t * sock)
static size_t php_sock_stream_read(php_stream *stream, php_netstream_data_t *sock)
{
size_t nr_bytes;
size_t nr_read = 0;
Expand All @@ -649,9 +649,9 @@ static size_t php_sock_stream_read(php_stream * stream, php_netstream_data_t * s
return nr_read;
}

static size_t php_sockop_read(php_stream * stream, char * buf, size_t count)
static size_t php_sockop_read(php_stream *stream, char *buf, size_t count)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
size_t ret = 0;

if (sock->is_blocked) {
Expand All @@ -673,9 +673,9 @@ static size_t php_sockop_read(php_stream * stream, char * buf, size_t count)
return ret;
}

static int php_sockop_close(php_stream * stream)
static int php_sockop_close(php_stream *stream)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;

#if HAVE_OPENSSL_EXT
if (sock->ssl_active) {
Expand All @@ -697,15 +697,15 @@ static int php_sockop_close(php_stream * stream)
return 0;
}

static int php_sockop_flush(php_stream * stream)
static int php_sockop_flush(php_stream *stream)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
return fsync(sock->socket);
}

static int php_sockop_cast(php_stream * stream, int castas, void ** ret)
static int php_sockop_cast(php_stream *stream, int castas, void **ret)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
TSRMLS_FETCH();

switch(castas) {
Expand Down Expand Up @@ -751,9 +751,9 @@ static int php_sockop_cast(php_stream * stream, int castas, void ** ret)
} while (0)


static char * php_sockop_gets(php_stream * stream, char *buf, size_t maxlen)
static char *php_sockop_gets(php_stream *stream, char *buf, size_t maxlen)
{
php_netstream_data_t * sock = (php_netstream_data_t*)stream->abstract;
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
char *p = NULL, *pe;
char *ret = NULL;
size_t amount = 0;
Expand Down
16 changes: 8 additions & 8 deletions main/php_network.h
View file
Expand Up @@ -82,7 +82,7 @@ struct _php_netstream_data_t {
char timeout_event;
#if HAVE_OPENSSL_EXT
/* openssl specific bits here */
SSL * ssl_handle;
SSL *ssl_handle;
int ssl_active;
#endif
};
Expand All @@ -93,19 +93,19 @@ typedef struct _php_netstream_data_t php_netstream_data_t;
extern php_stream_ops php_stream_socket_ops;
#define PHP_STREAM_IS_SOCKET (&php_stream_socket_ops)

PHPAPI php_stream * php_stream_sock_open_from_socket(int socket, int persistent);
PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent);
/* open a connection to a host using php_hostconnect and return a stream */
PHPAPI php_stream * php_stream_sock_open_host(const char * host, unsigned short port,
PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
int socktype, int timeout, int persistent);
PHPAPI php_stream * php_stream_sock_open_unix(const char * path, int persistent, struct timeval * timeout);
PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent, struct timeval *timeout);

PHPAPI void php_stream_sock_set_timeout(php_stream * stream, struct timeval *timeout);
PHPAPI int php_stream_sock_set_blocking(php_stream * stream, int mode);
PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout);
PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode);
/* set the chunk size for the stream; return the old chunk size */
PHPAPI size_t php_stream_sock_set_chunk_size(php_stream * stream, size_t size);
PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size);

#if HAVE_OPENSSL_EXT
PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream * stream, int activate, SSL_METHOD * method);
PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method);
#define php_stream_sock_ssl_activate(stream, activate) php_stream_sock_ssl_activate_with_method((stream), (activate), SSLv23_client_method())

#endif
Expand Down
20 changes: 10 additions & 10 deletions main/php_streams.h
View file
Expand Up @@ -35,13 +35,13 @@ typedef struct _php_stream_ops {
int (*flush)(php_stream *stream);
/* these are optional */
int (*seek)(php_stream *stream, off_t offset, int whence);
char * (*gets)(php_stream *stream, char *buf, size_t size);
char *(*gets)(php_stream *stream, char *buf, size_t size);
int (*cast)(php_stream *stream, int castas, void **ret);
const char *label; /* label for this ops structure */
} php_stream_ops;

/* options uses the IGNORE_URL family of defines from fopen_wrappers.h */
typedef php_stream * (*php_stream_factory_func_t)(char *filename, char *mode, int options, char ** opened_path TSRMLS_DC);
typedef php_stream *(*php_stream_factory_func_t)(char *filename, char *mode, int options, char **opened_path TSRMLS_DC);
typedef void (*php_stream_wrapper_dtor_func_t)(php_stream *stream);

typedef struct _php_stream_wrapper {
Expand Down Expand Up @@ -102,12 +102,12 @@ PHPAPI size_t php_stream_read_all(php_stream *src, char **buf, int persistent);
/* operations for a stdio FILE; use the php_stream_fopen_XXX funcs below */
extern php_stream_ops php_stream_stdio_ops;
/* like fopen, but returns a stream */
PHPAPI php_stream * php_stream_fopen(const char *filename, const char *mode, char **opened_path TSRMLS_DC);
PHPAPI php_stream * php_stream_fopen_with_path(char *filename, char * mode, char *path, char **opened_path TSRMLS_DC);
PHPAPI php_stream * php_stream_fopen_from_file(FILE *file, const char *mode);
PHPAPI php_stream * php_stream_fopen_from_pipe(FILE *file, const char *mode);
PHPAPI php_stream * php_stream_fopen_tmpfile(void);
PHPAPI php_stream * php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path TSRMLS_DC);
PHPAPI php_stream *php_stream_fopen(const char *filename, const char *mode, char **opened_path TSRMLS_DC);
PHPAPI php_stream *php_stream_fopen_with_path(char *filename, char *mode, char *path, char **opened_path TSRMLS_DC);
PHPAPI php_stream *php_stream_fopen_from_file(FILE *file, const char *mode);
PHPAPI php_stream *php_stream_fopen_from_pipe(FILE *file, const char *mode);
PHPAPI php_stream *php_stream_fopen_tmpfile(void);
PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path TSRMLS_DC);

/* coerce the stream into some other form */
/* cast as a stdio FILE * */
Expand All @@ -125,7 +125,7 @@ PHPAPI int php_stream_cast(php_stream *stream, int castas, void **ret, int show_
#define php_stream_can_cast(stream, as) php_stream_cast(stream, as, NULL, 0)

/* use this to check if a stream is of a particular type:
* PHPAPI int php_stream_is(php_stream *stream, php_stream_ops * ops); */
* PHPAPI int php_stream_is(php_stream *stream, php_stream_ops *ops); */
#define php_stream_is(stream, anops) ((stream)->ops == anops)
#define PHP_STREAM_IS_STDIO &php_stream_stdio_ops

Expand All @@ -137,7 +137,7 @@ int php_shutdown_stream_wrappers(TSRMLS_D);
PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper TSRMLS_DC);
PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC);

PHPAPI php_stream * php_stream_open_wrapper(char * path, char *mode, int options, char **opened_path TSRMLS_DC);
PHPAPI php_stream *php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path TSRMLS_DC);

#endif

Expand Down

0 comments on commit 28d6981

Please sign in to comment.