archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

change * formatting

Browse source
This commit is contained in:
Wez Furlong 2002-03-16 01:28:57 +00:00
parent a1667db82d
commit 09213d7bf8
11 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/ftp/ftp.c
View file

@ -613,7 +613,7 @@ bail:
/* {{{ ftp_put /* {{{ ftp_put
*/ */
int 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; databuf_t *data = NULL;
int size; int size;

4
ext/ftp/ftp.h
View file

@ -130,13 +130,13 @@ int ftp_pasv(ftpbuf_t *ftp, int pasv);
/* retrieves a file and saves its contents to outfp /* retrieves a file and saves its contents to outfp
* returns true on success, false on error * 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); ftptype_t type);
/* stores the data from a file, socket, or process as a file on the remote server /* stores the data from a file, socket, or process as a file on the remote server
* returns true on success, false on error * 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 */ /* returns the size of the given file, or -1 on error */
int ftp_size(ftpbuf_t *ftp, const char *path); int ftp_size(ftpbuf_t *ftp, const char *path);

4
ext/gd/gd.c
View file

@ -441,7 +441,7 @@ PHP_FUNCTION(imageloadfont)
int hdr_size = sizeof(gdFont) - sizeof(char *); int hdr_size = sizeof(gdFont) - sizeof(char *);
int ind, body_size, n=0, b, i, body_size_check; int ind, body_size, n=0, b, i, body_size_check;
gdFontPtr font; gdFontPtr font;
php_stream * stream; php_stream *stream;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) { if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); 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; zval **file, **srcx, **srcy, **width, **height;
gdImagePtr im = NULL; gdImagePtr im = NULL;
char *fn=NULL; char *fn=NULL;
php_stream * stream; php_stream *stream;
FILE * fp = NULL; FILE * fp = NULL;
int argc=ZEND_NUM_ARGS(); int argc=ZEND_NUM_ARGS();

2
ext/hyperwave/hw.c
View file

@ -2868,7 +2868,7 @@ PHP_FUNCTION(hw_new_document_from_file)
int issock=0; int issock=0;
int socketd=0; int socketd=0;
FILE *fp; FILE *fp;
php_stream * stream; php_stream *stream;
int ready=0; int ready=0;
int bcount=0; int bcount=0;
int use_include_path=0; int use_include_path=0;

64
ext/mailparse/mailparse.c
View file

@ -333,7 +333,7 @@ PHP_FUNCTION(mailparse_determine_best_xfer_encoding)
ZEND_VERIFY_RESOURCE(what); ZEND_VERIFY_RESOURCE(what);
if (type == php_file_le_stream()) { if (type == php_file_le_stream()) {
php_stream * stream = (php_stream*)what; php_stream *stream = (php_stream*)what;
php_stream_rewind(stream); php_stream_rewind(stream);
while(!php_stream_eof(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) /* {{{ proto boolean mailparse_stream_encode(resource sourcefp, resource destfp, string encoding)
Streams data from source file pointer, apply encoding and write to destfp */ 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; char buf = c;
return php_stream_write((php_stream*)stream, &buf, 1); 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); return php_stream_flush((php_stream*)stream);
} }
PHP_FUNCTION(mailparse_stream_encode) PHP_FUNCTION(mailparse_stream_encode)
{ {
zval ** srcfile, ** destfile, ** encod; zval **srcfile, **destfile, **encod;
void * what; void *what;
int type; int type;
php_stream * srcstream, * deststream; php_stream *srcstream, *deststream;
char * buf; char *buf;
size_t len; size_t len;
size_t bufsize = 2048; size_t bufsize = 2048;
enum mbfl_no_encoding enc; 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) { if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &srcfile, &destfile, &encod) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -454,8 +454,8 @@ PHP_FUNCTION(mailparse_stream_encode)
Incrementally parse data into buffer */ Incrementally parse data into buffer */
PHP_FUNCTION(mailparse_msg_parse) PHP_FUNCTION(mailparse_msg_parse)
{ {
zval ** arg, ** data; zval **arg, **data;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg, &data) == FAILURE) { if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg, &data) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -477,10 +477,10 @@ PHP_FUNCTION(mailparse_msg_parse)
Parse file and return a resource representing the structure */ Parse file and return a resource representing the structure */
PHP_FUNCTION(mailparse_msg_parse_file) PHP_FUNCTION(mailparse_msg_parse_file)
{ {
zval ** filename; zval **filename;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
char * filebuf; char *filebuf;
FILE * fp; FILE *fp;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -519,7 +519,7 @@ PHP_FUNCTION(mailparse_msg_parse_file)
PHP_FUNCTION(mailparse_msg_free) PHP_FUNCTION(mailparse_msg_free)
{ {
zval **arg; zval **arg;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -541,7 +541,7 @@ PHP_FUNCTION(mailparse_msg_free)
Returns a handle that can be used to parse a message */ Returns a handle that can be used to parse a message */
PHP_FUNCTION(mailparse_msg_create) PHP_FUNCTION(mailparse_msg_create)
{ {
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
rfcbuf = rfc2045_alloc_ac(); 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) 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 intbuf[16];
char buf[256]; char buf[256];
int len, i = 0; 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) PHP_FUNCTION(mailparse_msg_get_structure)
{ {
zval **arg; zval **arg;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -600,8 +600,8 @@ PHP_FUNCTION(mailparse_msg_get_structure)
/* callback for decoding using a "userdefined" php function */ /* callback for decoding using a "userdefined" php function */
static int extract_callback_user_func(const char *p, size_t n, zval *userfunc) static int extract_callback_user_func(const char *p, size_t n, zval *userfunc)
{ {
zval * retval; zval *retval;
zval * arg; zval *arg;
TSRMLS_FETCH(); TSRMLS_FETCH();
MAKE_STD_ZVAL(retval); 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) PHP_FUNCTION(mailparse_msg_extract_part)
{ {
zval **arg, **bodystr, **cbfunc; zval **arg, **bodystr, **cbfunc;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
off_t start, end, body; off_t start, end, body;
off_t nlines; off_t nlines;
off_t nbodylines; off_t nbodylines;
@ -689,9 +689,9 @@ PHP_FUNCTION(mailparse_msg_extract_part)
PHP_FUNCTION(mailparse_msg_extract_part_file) PHP_FUNCTION(mailparse_msg_extract_part_file)
{ {
zval **arg, **filename, **cbfunc; zval **arg, **filename, **cbfunc;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
char * filebuf = NULL; char *filebuf = NULL;
FILE * fp = NULL; FILE *fp = NULL;
off_t start, end, body; off_t start, end, body;
off_t nlines; off_t nlines;
off_t nbodylines; off_t nbodylines;
@ -774,14 +774,14 @@ cleanup:
that are emitted here - it will break my PHP scripts if you do! */ that are emitted here - it will break my PHP scripts if you do! */
PHP_FUNCTION(mailparse_msg_get_part_data) PHP_FUNCTION(mailparse_msg_get_part_data)
{ {
zval ** arg; zval **arg;
struct rfc2045 * rfcbuf; struct rfc2045 *rfcbuf;
char * content_type, *transfer_encoding, *charset; char *content_type, *transfer_encoding, *charset;
off_t start, end, body, nlines, nbodylines; off_t start, end, body, nlines, nbodylines;
char * disposition, * disposition_name, *disposition_filename; char *disposition, *disposition_name, *disposition_filename;
char *p; char *p;
struct rfc2045attr * attr; struct rfc2045attr *attr;
zval * headers; zval *headers;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -865,8 +865,8 @@ PHP_FUNCTION(mailparse_msg_get_part_data)
Returns a handle on a given section in a mimemessage */ Returns a handle on a given section in a mimemessage */
PHP_FUNCTION(mailparse_msg_get_part) PHP_FUNCTION(mailparse_msg_get_part)
{ {
zval ** arg, ** mimesection; zval **arg, **mimesection;
struct rfc2045 * rfcbuf, * newsection; struct rfc2045 *rfcbuf, *newsection;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg, &mimesection) == FAILURE) { if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg, &mimesection) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;

4
ext/ming/ming.c
View file

@ -230,7 +230,7 @@ static SWFInput newSWFInput_sock(int socket)
static SWFInput getInput(zval **zfile TSRMLS_DC) static SWFInput getInput(zval **zfile TSRMLS_DC)
{ {
FILE *file; FILE *file;
void * what; void *what;
int type; int type;
SWFInput input; SWFInput input;
@ -1604,7 +1604,7 @@ PHP_FUNCTION(swfmovie_save)
{ {
zval **x; zval **x;
long retval; long retval;
php_stream * stream; php_stream *stream;
if((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &x) == FAILURE) if((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &x) == FAILURE)
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;

2
ext/pdf/pdf.c
View file

@ -465,7 +465,7 @@ PHP_FUNCTION(pdf_set_info_keywords)
PHP_FUNCTION(pdf_open) PHP_FUNCTION(pdf_open)
{ {
zval **file; zval **file;
void * what; void *what;
int type; int type;
FILE *fp = NULL; FILE *fp = NULL;
PDF *pdf; PDF *pdf;

2
ext/pgsql/pgsql.c
View file

@ -1435,7 +1435,7 @@ PHP_FUNCTION(pg_trace)
PGconn *pgsql; PGconn *pgsql;
char *mode = "w"; char *mode = "w";
FILE *fp; FILE *fp;
php_stream * stream; php_stream *stream;
id = PGG(default_link); id = PGG(default_link);
switch (ZEND_NUM_ARGS()) { switch (ZEND_NUM_ARGS()) {

2
ext/recode/recode.c
View file

@ -163,7 +163,7 @@ PHP_FUNCTION(recode_file)
int success; int success;
pval **req; pval **req;
pval **input, **output; pval **input, **output;
php_stream * instream, *outstream; php_stream *instream, *outstream;
FILE *in_fp, *out_fp; FILE *in_fp, *out_fp;
int in_type, out_type; int in_type, out_type;

2
ext/standard/basic_functions.c
View file

@ -1508,7 +1508,7 @@ PHP_FUNCTION(error_log)
PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers TSRMLS_DC) 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) { switch (opt_err) {

2
ext/standard/exec.c
View file

@ -51,7 +51,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
int overflow_limit, lcmd, ldir; int overflow_limit, lcmd, ldir;
int rsrc_id; int rsrc_id;
char *b, *c, *d=NULL; char *b, *c, *d=NULL;
php_stream * stream = NULL; php_stream *stream = NULL;
#if PHP_SIGCHILD #if PHP_SIGCHILD
void (*sig_handler)(); void (*sig_handler)();
#endif #endif