summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/ftp/ftp.c2
-rw-r--r--ext/ftp/ftp.h4
-rw-r--r--ext/gd/gd.c4
-rw-r--r--ext/hyperwave/hw.c2
-rwxr-xr-xext/mailparse/mailparse.c64
-rw-r--r--ext/ming/ming.c4
-rw-r--r--ext/pdf/pdf.c2
-rw-r--r--ext/pgsql/pgsql.c2
-rw-r--r--ext/recode/recode.c2
-rw-r--r--ext/standard/basic_functions.c2
-rw-r--r--ext/standard/exec.c2
11 files changed, 45 insertions, 45 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 4121e8dbf3..c3a7818534 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -613,7 +613,7 @@ bail:
/* {{{ ftp_put
*/
int
-ftp_put(ftpbuf_t *ftp, const char *path, php_stream * instream, ftptype_t type)
+ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type)
{
databuf_t *data = NULL;
int size;
diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
index 38b75b1f73..b201045f9b 100644
--- a/ext/ftp/ftp.h
+++ b/ext/ftp/ftp.h
@@ -130,13 +130,13 @@ int ftp_pasv(ftpbuf_t *ftp, int pasv);
/* retrieves a file and saves its contents to outfp
* returns true on success, false on error
*/
-int ftp_get(ftpbuf_t *ftp, php_stream * outstream, const char *path,
+int ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path,
ftptype_t type);
/* stores the data from a file, socket, or process as a file on the remote server
* returns true on success, false on error
*/
-int ftp_put(ftpbuf_t *ftp, const char *path, php_stream * instream, ftptype_t type);
+int ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type);
/* returns the size of the given file, or -1 on error */
int ftp_size(ftpbuf_t *ftp, const char *path);
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 2bdeb0b6d4..c839bfe267 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -441,7 +441,7 @@ PHP_FUNCTION(imageloadfont)
int hdr_size = sizeof(gdFont) - sizeof(char *);
int ind, body_size, n=0, b, i, body_size_check;
gdFontPtr font;
- php_stream * stream;
+ php_stream *stream;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
@@ -1133,7 +1133,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
zval **file, **srcx, **srcy, **width, **height;
gdImagePtr im = NULL;
char *fn=NULL;
- php_stream * stream;
+ php_stream *stream;
FILE * fp = NULL;
int argc=ZEND_NUM_ARGS();
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index cc2991dab8..006a8f2209 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -2868,7 +2868,7 @@ PHP_FUNCTION(hw_new_document_from_file)
int issock=0;
int socketd=0;
FILE *fp;
- php_stream * stream;
+ php_stream *stream;
int ready=0;
int bcount=0;
int use_include_path=0;
diff --git a/ext/mailparse/mailparse.c b/ext/mailparse/mailparse.c
index d3cb046951..9dded51aad 100755
--- a/ext/mailparse/mailparse.c
+++ b/ext/mailparse/mailparse.c
@@ -333,7 +333,7 @@ PHP_FUNCTION(mailparse_determine_best_xfer_encoding)
ZEND_VERIFY_RESOURCE(what);
if (type == php_file_le_stream()) {
- php_stream * stream = (php_stream*)what;
+ php_stream *stream = (php_stream*)what;
php_stream_rewind(stream);
while(!php_stream_eof(stream)) {
@@ -372,27 +372,27 @@ PHP_FUNCTION(mailparse_determine_best_xfer_encoding)
/* {{{ proto boolean mailparse_stream_encode(resource sourcefp, resource destfp, string encoding)
Streams data from source file pointer, apply encoding and write to destfp */
-static int mailparse_stream_output(int c, void * stream)
+static int mailparse_stream_output(int c, void *stream)
{
char buf = c;
return php_stream_write((php_stream*)stream, &buf, 1);
}
-static int mailparse_stream_flush(void * stream)
+static int mailparse_stream_flush(void *stream)
{
return php_stream_flush((php_stream*)stream);
}
PHP_FUNCTION(mailparse_stream_encode)
{
- zval ** srcfile, ** destfile, ** encod;
- void * what;
+ zval **srcfile, **destfile, **encod;
+ void *what;
int type;
- php_stream * srcstream, * deststream;
- char * buf;
+ php_stream *srcstream, *deststream;
+ char *buf;
size_t len;
size_t bufsize = 2048;
enum mbfl_no_encoding enc;
- mbfl_convert_filter * conv = NULL;
+ mbfl_convert_filter *conv = NULL;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &srcfile, &destfile, &encod) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -454,8 +454,8 @@ PHP_FUNCTION(mailparse_stream_encode)
Incrementally parse data into buffer */
PHP_FUNCTION(mailparse_msg_parse)
{
- zval ** arg, ** data;
- struct rfc2045 * rfcbuf;
+ zval **arg, **data;
+ struct rfc2045 *rfcbuf;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg, &data) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -477,10 +477,10 @@ PHP_FUNCTION(mailparse_msg_parse)
Parse file and return a resource representing the structure */
PHP_FUNCTION(mailparse_msg_parse_file)
{
- zval ** filename;
- struct rfc2045 * rfcbuf;
- char * filebuf;
- FILE * fp;
+ zval **filename;
+ struct rfc2045 *rfcbuf;
+ char *filebuf;
+ FILE *fp;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -519,7 +519,7 @@ PHP_FUNCTION(mailparse_msg_parse_file)
PHP_FUNCTION(mailparse_msg_free)
{
zval **arg;
- struct rfc2045 * rfcbuf;
+ struct rfc2045 *rfcbuf;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -541,7 +541,7 @@ PHP_FUNCTION(mailparse_msg_free)
Returns a handle that can be used to parse a message */
PHP_FUNCTION(mailparse_msg_create)
{
- struct rfc2045 * rfcbuf;
+ struct rfc2045 *rfcbuf;
rfcbuf = rfc2045_alloc_ac();
@@ -551,7 +551,7 @@ PHP_FUNCTION(mailparse_msg_create)
static void get_structure_callback(struct rfc2045 *p, struct rfc2045id *id, void *ptr)
{
- zval * return_value = (zval *)ptr;
+ zval *return_value = (zval *)ptr;
char intbuf[16];
char buf[256];
int len, i = 0;
@@ -577,7 +577,7 @@ static void get_structure_callback(struct rfc2045 *p, struct rfc2045id *id, void
PHP_FUNCTION(mailparse_msg_get_structure)
{
zval **arg;
- struct rfc2045 * rfcbuf;
+ struct rfc2045 *rfcbuf;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -600,8 +600,8 @@ PHP_FUNCTION(mailparse_msg_get_structure)
/* callback for decoding using a "userdefined" php function */
static int extract_callback_user_func(const char *p, size_t n, zval *userfunc)
{
- zval * retval;
- zval * arg;
+ zval *retval;
+ zval *arg;
TSRMLS_FETCH();
MAKE_STD_ZVAL(retval);
@@ -636,7 +636,7 @@ static int extract_callback_stdout(const char *p, size_t n, void *ptr)
PHP_FUNCTION(mailparse_msg_extract_part)
{
zval **arg, **bodystr, **cbfunc;
- struct rfc2045 * rfcbuf;
+ struct rfc2045 *rfcbuf;
off_t start, end, body;
off_t nlines;
off_t nbodylines;
@@ -689,9 +689,9 @@ PHP_FUNCTION(mailparse_msg_extract_part)
PHP_FUNCTION(mailparse_msg_extract_part_file)
{
zval **arg, **filename, **cbfunc;
- struct rfc2045 * rfcbuf;
- char * filebuf = NULL;
- FILE * fp = NULL;
+ struct rfc2045 *rfcbuf;
+ char *filebuf = NULL;
+ FILE *fp = NULL;
off_t start, end, body;
off_t nlines;
off_t nbodylines;
@@ -774,14 +774,14 @@ cleanup:
that are emitted here - it will break my PHP scripts if you do! */
PHP_FUNCTION(mailparse_msg_get_part_data)
{
- zval ** arg;
- struct rfc2045 * rfcbuf;
- char * content_type, *transfer_encoding, *charset;
+ zval **arg;
+ struct rfc2045 *rfcbuf;
+ char *content_type, *transfer_encoding, *charset;
off_t start, end, body, nlines, nbodylines;
- char * disposition, * disposition_name, *disposition_filename;
+ char *disposition, *disposition_name, *disposition_filename;
char *p;
- struct rfc2045attr * attr;
- zval * headers;
+ struct rfc2045attr *attr;
+ zval *headers;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -865,8 +865,8 @@ PHP_FUNCTION(mailparse_msg_get_part_data)
Returns a handle on a given section in a mimemessage */
PHP_FUNCTION(mailparse_msg_get_part)
{
- zval ** arg, ** mimesection;
- struct rfc2045 * rfcbuf, * newsection;
+ zval **arg, **mimesection;
+ struct rfc2045 *rfcbuf, *newsection;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg, &mimesection) == FAILURE) {
WRONG_PARAM_COUNT;
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index 46d0168c46..6bbc93d1dd 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -230,7 +230,7 @@ static SWFInput newSWFInput_sock(int socket)
static SWFInput getInput(zval **zfile TSRMLS_DC)
{
FILE *file;
- void * what;
+ void *what;
int type;
SWFInput input;
@@ -1604,7 +1604,7 @@ PHP_FUNCTION(swfmovie_save)
{
zval **x;
long retval;
- php_stream * stream;
+ php_stream *stream;
if((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &x) == FAILURE)
WRONG_PARAM_COUNT;
diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index f283f0ce87..4b6a888563 100644
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -465,7 +465,7 @@ PHP_FUNCTION(pdf_set_info_keywords)
PHP_FUNCTION(pdf_open)
{
zval **file;
- void * what;
+ void *what;
int type;
FILE *fp = NULL;
PDF *pdf;
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 35d31bcae5..43eae5d0d4 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1435,7 +1435,7 @@ PHP_FUNCTION(pg_trace)
PGconn *pgsql;
char *mode = "w";
FILE *fp;
- php_stream * stream;
+ php_stream *stream;
id = PGG(default_link);
switch (ZEND_NUM_ARGS()) {
diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 488e3b3cfd..d552d765be 100644
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -163,7 +163,7 @@ PHP_FUNCTION(recode_file)
int success;
pval **req;
pval **input, **output;
- php_stream * instream, *outstream;
+ php_stream *instream, *outstream;
FILE *in_fp, *out_fp;
int in_type, out_type;
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 89e354891a..52af756dfc 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1508,7 +1508,7 @@ PHP_FUNCTION(error_log)
PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers TSRMLS_DC)
{
- php_stream * stream = NULL;
+ php_stream *stream = NULL;
switch (opt_err) {
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 34a4cfbaf8..f5f337fee5 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -51,7 +51,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
int overflow_limit, lcmd, ldir;
int rsrc_id;
char *b, *c, *d=NULL;
- php_stream * stream = NULL;
+ php_stream *stream = NULL;
#if PHP_SIGCHILD
void (*sig_handler)();
#endif
View Lorry Controller Status