Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

- Nuke php3 legacy

migration/RELEASE_1_0_0
foobar 20 years ago
parent
c33bb84930
commit
0ac2b74b0b
22 changed files with 92 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ext/ereg/ereg.c
  2. 48
      ext/standard/array.c
  3. 2
      ext/standard/assert.c
  4. 32
      ext/standard/basic_functions.c
  5. 16
      ext/standard/browscap.c
  6. 2
      ext/standard/cyr_convert.c
  7. 6
      ext/standard/dir.c
  8. 8
      ext/standard/exec.c
  9. 2
      ext/standard/exec.h
  10. 4
      ext/standard/file.c
  11. 16
      ext/standard/filestat.c
  12. 4
      ext/standard/image.c
  13. 2
      ext/standard/info.c
  14. 2
      ext/standard/iptc.c
  15. 2
      ext/standard/php_filestat.h
  16. 4
      ext/standard/php_string.h
  17. 2
      ext/standard/quot_print.c
  18. 4
      ext/standard/reg.c
  19. 8
      ext/standard/scanf.c
  20. 4
      ext/standard/scanf.h
  21. 2
      ext/standard/string.c
  22. 12
      ext/standard/type.c

4
ext/ereg/ereg.c
View File

@ -184,7 +184,7 @@ static void php_reg_eprint(int err, regex_t *re) {
*/
static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
{
pval **regex, /* Regular expression */
zval **regex, /* Regular expression */
**findin, /* String to apply expression to */
**array = NULL; /* Optional register array */
regex_t re;
@ -442,7 +442,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
*/
static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
{
pval **arg_pattern,
zval **arg_pattern,
**arg_replace,
**arg_string;
char *pattern;

48
ext/standard/array.c
View File

@ -361,15 +361,15 @@ static int array_data_compare(const void *a, const void *b TSRMLS_DC)
{
Bucket *f;
Bucket *s;
pval result;
pval *first;
pval *second;
zval result;
zval *first;
zval *second;
f = *((Bucket **) a);
s = *((Bucket **) b);
first = *((pval **) f->pData);
second = *((pval **) s->pData);
first = *((zval **) f->pData);
second = *((zval **) s->pData);
if (ARRAYG(compare_func)(&result, first, second TSRMLS_CC) == FAILURE) {
return 0;
@ -411,8 +411,8 @@ static int array_natural_general_compare(const void *a, const void *b, int fold_
f = *((Bucket **) a);
s = *((Bucket **) b);
fval = *((pval **) f->pData);
sval = *((pval **) s->pData);
fval = *((zval **) f->pData);
sval = *((zval **) s->pData);
first = *fval;
second = *sval;
if (Z_TYPE_P(fval) != IS_STRING) {
@ -717,9 +717,9 @@ static int array_user_key_compare(const void *a, const void *b TSRMLS_DC)
{
Bucket *f;
Bucket *s;
pval key1, key2;
pval *args[2];
pval retval;
zval key1, key2;
zval *args[2];
zval retval;
int status;
args[0] = &key1;
@ -808,7 +808,7 @@ PHP_FUNCTION(uksort)
Advances array argument's internal pointer to the last element and return it */
PHP_FUNCTION(end)
{
pval **array, **entry;
zval **array, **entry;
HashTable *target_hash;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@ -835,7 +835,7 @@ PHP_FUNCTION(end)
Move array argument's internal pointer to the previous element and return it */
PHP_FUNCTION(prev)
{
pval **array, **entry;
zval **array, **entry;
HashTable *target_hash;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@ -862,7 +862,7 @@ PHP_FUNCTION(prev)
Move array argument's internal pointer to the next element and return it */
PHP_FUNCTION(next)
{
pval **array, **entry;
zval **array, **entry;
HashTable *target_hash;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@ -889,7 +889,7 @@ PHP_FUNCTION(next)
Set array argument's internal pointer to the first element and return it */
PHP_FUNCTION(reset)
{
pval **array, **entry;
zval **array, **entry;
HashTable *target_hash;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@ -916,7 +916,7 @@ PHP_FUNCTION(reset)
Return the element currently pointed to by the internal array pointer */
PHP_FUNCTION(current)
{
pval **array, **entry;
zval **array, **entry;
HashTable *target_hash;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@ -938,7 +938,7 @@ PHP_FUNCTION(current)
Return the key of the element currently pointed to by the internal array pointer */
PHP_FUNCTION(key)
{
pval **array;
zval **array;
char *string_key;
uint string_length;
ulong num_key;
@ -976,7 +976,7 @@ PHP_FUNCTION(key)
PHP_FUNCTION(min)
{
int argc=ZEND_NUM_ARGS();
pval **result;
zval **result;
if (argc<=0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Atleast one value should be passed");
@ -984,7 +984,7 @@ PHP_FUNCTION(min)
}
set_compare_func(SORT_REGULAR TSRMLS_CC);
if (argc == 1) {
pval **arr;
zval **arr;
if (zend_get_parameters_ex(1, &arr) == FAILURE || Z_TYPE_PP(arr) != IS_ARRAY) {
WRONG_PARAM_COUNT;
@ -996,8 +996,8 @@ PHP_FUNCTION(min)
RETURN_FALSE;
}
} else {
pval ***args = (pval ***) safe_emalloc(sizeof(pval **), ZEND_NUM_ARGS(), 0);
pval **min, result;
zval ***args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
zval **min, result;
int i;
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args)==FAILURE) {
@ -1026,7 +1026,7 @@ PHP_FUNCTION(min)
PHP_FUNCTION(max)
{
int argc=ZEND_NUM_ARGS();
pval **result;
zval **result;
if (argc<=0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Atleast one value should be passed");
@ -1034,7 +1034,7 @@ PHP_FUNCTION(max)
}
set_compare_func(SORT_REGULAR TSRMLS_CC);
if (argc == 1) {
pval **arr;
zval **arr;
if (zend_get_parameters_ex(1, &arr) == FAILURE || Z_TYPE_PP(arr) != IS_ARRAY) {
WRONG_PARAM_COUNT;
@ -1046,8 +1046,8 @@ PHP_FUNCTION(max)
RETURN_FALSE;
}
} else {
pval ***args = (pval ***) safe_emalloc(sizeof(pval **), ZEND_NUM_ARGS(), 0);
pval **max, result;
zval ***args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
zval **max, result;
int i;
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {

2
ext/standard/assert.c
View File

@ -234,7 +234,7 @@ PHP_FUNCTION(assert)
PHP_FUNCTION(assert_options)
{
pval **what, **value;
zval **what, **value;
int oldint;
int ac = ZEND_NUM_ARGS();

32
ext/standard/basic_functions.c
View File

@ -165,7 +165,7 @@ static void user_tick_function_dtor(user_tick_function_entry *tick_function_entr
#undef sprintf
function_entry basic_functions[] = {
zend_function_entry basic_functions[] = {
PHP_FE(constant, NULL)
PHP_FE(bin2hex, NULL)
PHP_FE(sleep, NULL)
@ -1438,7 +1438,7 @@ PHP_FUNCTION(getenv)
Set the value of an environment variable */
PHP_FUNCTION(putenv)
{
pval **str;
zval **str;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
@ -1734,7 +1734,7 @@ PHP_FUNCTION(flush)
Delay for a given number of seconds */
PHP_FUNCTION(sleep)
{
pval **num;
zval **num;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
WRONG_PARAM_COUNT;
@ -1755,7 +1755,7 @@ PHP_FUNCTION(sleep)
PHP_FUNCTION(usleep)
{
#if HAVE_USLEEP
pval **num;
zval **num;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
WRONG_PARAM_COUNT;
@ -1854,7 +1854,7 @@ PHP_FUNCTION(get_current_user)
Get the value of a PHP configuration option */
PHP_FUNCTION(get_cfg_var)
{
pval **varname;
zval **varname;
char *value;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &varname) == FAILURE) {
@ -1874,7 +1874,7 @@ PHP_FUNCTION(get_cfg_var)
Set the current active configuration setting of magic_quotes_runtime and return previous */
PHP_FUNCTION(set_magic_quotes_runtime)
{
pval **new_setting;
zval **new_setting;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_setting) == FAILURE) {
RETURN_FALSE;
@ -1920,7 +1920,7 @@ error options:
Send an error message somewhere */
PHP_FUNCTION(error_log)
{
pval **string, **erropt = NULL, **option = NULL, **emailhead = NULL;
zval **string, **erropt = NULL, **option = NULL, **emailhead = NULL;
int opt_err = 0;
char *message, *opt = NULL, *headers = NULL;
@ -2541,7 +2541,7 @@ PHP_FUNCTION(highlight_string)
Get a configuration option */
PHP_FUNCTION(ini_get)
{
pval **varname;
zval **varname;
char *str;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &varname) == FAILURE) {
@ -2639,7 +2639,7 @@ static int php_ini_check_path(char *option_name, int option_len, char *new_optio
Set a configuration option, returns false on error and the old value of the configuration option on success */
PHP_FUNCTION(ini_set)
{
pval **varname, **new_value;
zval **varname, **new_value;
char *old_value;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &varname, &new_value) == FAILURE) {
@ -2702,7 +2702,7 @@ PHP_FUNCTION(ini_set)
Restore the value of a configuration option specified by varname */
PHP_FUNCTION(ini_restore)
{
pval **varname;
zval **varname;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &varname) == FAILURE) {
WRONG_PARAM_COUNT;
@ -2719,7 +2719,7 @@ PHP_FUNCTION(ini_restore)
PHP_FUNCTION(set_include_path)
{
pval **new_value;
zval **new_value;
char *old_value;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_value) == FAILURE) {
@ -2824,7 +2824,7 @@ PHP_FUNCTION(connection_status)
Set whether we want to ignore a user abort event or not */
PHP_FUNCTION(ignore_user_abort)
{
pval **arg;
zval **arg;
int old_setting;
old_setting = PG(ignore_user_abort);
@ -2854,7 +2854,7 @@ PHP_FUNCTION(ignore_user_abort)
Returns port associated with service. Protocol must be "tcp" or "udp" */
PHP_FUNCTION(getservbyname)
{
pval **name, **proto;
zval **name, **proto;
struct servent *serv;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &name, &proto) == FAILURE) {
@ -2879,7 +2879,7 @@ PHP_FUNCTION(getservbyname)
Returns service name associated with port. Protocol must be "tcp" or "udp" */
PHP_FUNCTION(getservbyport)
{
pval **port, **proto;
zval **port, **proto;
struct servent *serv;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &port, &proto) == FAILURE) {
@ -2904,7 +2904,7 @@ PHP_FUNCTION(getservbyport)
Returns protocol number associated with name as per /etc/protocols */
PHP_FUNCTION(getprotobyname)
{
pval **name;
zval **name;
struct protoent *ent;
if (ZEND_NUM_ARGS() != 1
@ -2932,7 +2932,7 @@ PHP_FUNCTION(getprotobyname)
Returns protocol name associated with protocol number proto */
PHP_FUNCTION(getprotobynumber)
{
pval **proto;
zval **proto;
struct protoent *ent;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &proto) == FAILURE) {

16
ext/standard/browscap.c
View File

@ -33,17 +33,17 @@ static zval *current_section;
/* OBJECTS_FIXME: This whole extension needs going through. The use of objects looks pretty broken here */
static void browscap_entry_dtor(zval **pvalue)
static void browscap_entry_dtor(zval **zvalue)
{
if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
zend_hash_destroy(Z_ARRVAL_PP(pvalue));
free(Z_ARRVAL_PP(pvalue));
} else if (Z_TYPE_PP(pvalue) == IS_STRING) {
if (Z_STRVAL_PP(pvalue)) {
free(Z_STRVAL_PP(pvalue));
if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
zend_hash_destroy(Z_ARRVAL_PP(zvalue));
free(Z_ARRVAL_PP(zvalue));
} else if (Z_TYPE_PP(zvalue) == IS_STRING) {
if (Z_STRVAL_PP(zvalue)) {
free(Z_STRVAL_PP(zvalue));
}
}
free(*pvalue);
free(*zvalue);
}
/* {{{ convert_browscap_pattern

2
ext/standard/cyr_convert.c
View File

@ -271,7 +271,7 @@ static char * php_convert_cyr_string(unsigned char *str, int length, char from,
Convert from one Cyrillic character set to another */
PHP_FUNCTION(convert_cyr_string)
{
pval **str_arg, **fr_cs, **to_cs;
zval **str_arg, **fr_cs, **to_cs;
unsigned char *str;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3,&str_arg,&fr_cs, &to_cs)==FAILURE)

6
ext/standard/dir.c
View File

@ -231,7 +231,7 @@ PHP_FUNCTION(getdir)
Close directory connection identified by the dir_handle */
PHP_FUNCTION(closedir)
{
pval **id, **tmp, *myself;
zval **id, **tmp, *myself;
php_stream *dirp;
FETCH_DIRP();
@ -329,7 +329,7 @@ PHP_FUNCTION(getcwd)
Rewind dir_handle back to the start */
PHP_FUNCTION(rewinddir)
{
pval **id, **tmp, *myself;
zval **id, **tmp, *myself;
php_stream *dirp;
FETCH_DIRP();
@ -342,7 +342,7 @@ PHP_FUNCTION(rewinddir)
Read directory entry from dir_handle */
PHP_NAMED_FUNCTION(php_if_readdir)
{
pval **id, **tmp, *myself;
zval **id, **tmp, *myself;
php_stream *dirp;
php_stream_dirent entry;

8
ext/standard/exec.c
View File

@ -57,7 +57,7 @@
* If type==3, output will be printed binary, no lines will be saved or returned (passthru)
*
*/
int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
{
FILE *fp;
char *buf, *tmp=NULL;
@ -372,7 +372,7 @@ char *php_escape_shell_arg(char *str) {
Escape shell metacharacters */
PHP_FUNCTION(escapeshellcmd)
{
pval **arg1;
zval **arg1;
char *cmd = NULL;
if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
@ -392,7 +392,7 @@ PHP_FUNCTION(escapeshellcmd)
Quote and escape an argument for use in a shell command */
PHP_FUNCTION(escapeshellarg)
{
pval **arg1;
zval **arg1;
char *cmd = NULL;
if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
@ -414,7 +414,7 @@ PHP_FUNCTION(shell_exec)
{
FILE *in;
size_t total_readbytes;
pval **cmd;
zval **cmd;
char *ret;
php_stream *stream;

2
ext/standard/exec.h
View File

@ -36,6 +36,6 @@ PHP_MINIT_FUNCTION(proc_open);
PHPAPI char *php_escape_shell_cmd(char *);
PHPAPI char *php_escape_shell_arg(char *);
int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC);
int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC);
#endif /* EXEC_H */

4
ext/standard/file.c
View File

@ -823,7 +823,7 @@ parse_eol:
Create a unique filename in a directory */
PHP_FUNCTION(tempnam)
{
pval **arg1, **arg2;
zval **arg1, **arg2;
char *d;
char *opened_path;
char p[64];
@ -1501,7 +1501,7 @@ PHP_FUNCTION(readfile)
Return or change the umask */
PHP_FUNCTION(umask)
{
pval **arg1;
zval **arg1;
int oldumask;
int arg_count = ZEND_NUM_ARGS();

16
ext/standard/filestat.c
View File

@ -118,7 +118,7 @@ PHP_RSHUTDOWN_FUNCTION(filestat)
Get total disk space for filesystem that path is on */
PHP_FUNCTION(disk_total_space)
{
pval **path;
zval **path;
#ifdef WINDOWS
double bytestotal;
@ -221,7 +221,7 @@ PHP_FUNCTION(disk_total_space)
Get free disk space for filesystem that path is on */
PHP_FUNCTION(disk_free_space)
{
pval **path;
zval **path;
#ifdef WINDOWS
double bytesfree;
@ -329,7 +329,7 @@ PHP_FUNCTION(disk_free_space)
PHP_FUNCTION(chgrp)
{
#if !defined(WINDOWS)
pval **filename, **group;
zval **filename, **group;
gid_t gid;
struct group *gr=NULL;
int ret;
@ -379,7 +379,7 @@ PHP_FUNCTION(chgrp)
PHP_FUNCTION(chown)
{
#if !defined(WINDOWS)
pval **filename, **user;
zval **filename, **user;
int ret;
uid_t uid;
struct passwd *pw = NULL;
@ -425,7 +425,7 @@ PHP_FUNCTION(chown)
Change file mode */
PHP_FUNCTION(chmod)
{
pval **filename, **mode;
zval **filename, **mode;
int ret;
mode_t imode;
@ -466,7 +466,7 @@ PHP_FUNCTION(chmod)
Set modification time of file */
PHP_FUNCTION(touch)
{
pval **filename, **filetime, **fileatime;
zval **filename, **filetime, **fileatime;
int ret;
struct stat sb;
FILE *file;
@ -547,7 +547,7 @@ PHP_FUNCTION(clearstatcache)
/* {{{ php_stat
*/
PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, pval *return_value TSRMLS_DC)
PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, zval *return_value TSRMLS_DC)
{
zval *stat_dev, *stat_ino, *stat_mode, *stat_nlink, *stat_uid, *stat_gid, *stat_rdev,
*stat_size, *stat_atime, *stat_mtime, *stat_ctime, *stat_blksize, *stat_blocks;
@ -793,7 +793,7 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ
/* another quickie macro to make defining similar functions easier */
#define FileFunction(name, funcnum) \
void name(INTERNAL_FUNCTION_PARAMETERS) { \
pval **filename; \
zval **filename; \
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { \
WRONG_PARAM_COUNT; \
} \

4
ext/standard/image.c
View File

@ -468,7 +468,7 @@ static int php_read_APP(php_stream * stream, unsigned int marker, zval *info TSR
/* {{{ php_handle_jpeg
main loop to parse JPEG structure */
static struct gfxinfo *php_handle_jpeg (php_stream * stream, pval *info TSRMLS_DC)
static struct gfxinfo *php_handle_jpeg (php_stream * stream, zval *info TSRMLS_DC)
{
struct gfxinfo *result = NULL;
unsigned int marker = M_PSEUDO;
@ -796,7 +796,7 @@ static unsigned php_ifd_get32u(void *Long, int motorola_intel)
/* {{{ php_handle_tiff
main loop to parse TIFF structure */
static struct gfxinfo *php_handle_tiff (php_stream * stream, pval *info, int motorola_intel TSRMLS_DC)
static struct gfxinfo *php_handle_tiff (php_stream * stream, zval *info, int motorola_intel TSRMLS_DC)
{
struct gfxinfo *result = NULL;
int i, num_entries;

2
ext/standard/info.c
View File

@ -708,7 +708,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
}
if (flag & PHP_INFO_VARIABLES) {
pval **data;
zval **data;
SECTION("PHP Variables");

2
ext/standard/iptc.c
View File

@ -360,7 +360,7 @@ PHP_FUNCTION(iptcparse)
INIT_PZVAL(values);
array_init(values);
zend_hash_update(Z_ARRVAL_P(return_value), key, strlen(key)+1, (void *) &values, sizeof(pval*), (void **) &element);
zend_hash_update(Z_ARRVAL_P(return_value), key, strlen(key)+1, (void *) &values, sizeof(zval*), (void **) &element);
}
add_next_index_stringl(*element, buffer+inx, len, 1);

2
ext/standard/php_filestat.h
View File

@ -81,7 +81,7 @@ typedef unsigned int php_stat_len;
typedef int php_stat_len;
#endif
PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, pval *return_value TSRMLS_DC);
PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, zval *return_value TSRMLS_DC);
/* Switches for various filestat functions: */
#define FS_PERMS 0

4
ext/standard/php_string.h
View File

@ -142,8 +142,8 @@ PHPAPI char *php_str_to_str(char *haystack, int length, char *needle,
PHPAPI char *php_trim(char *c, int len, char *what, int what_len, zend_uchar str_type, zval *return_value, int mode TSRMLS_DC);
PHPAPI int32_t php_u_strip_tags(UChar *rbuf, int32_t len, int *stateptr, UChar *allow, int32_t allow_len TSRMLS_DC);
PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int allow_len);
PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, pval *result, int case_sensitivity, int *replace_count);
PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result);
PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, zval *result, int case_sensitivity, int *replace_count);
PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, zval *result);
PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value);
PHPAPI void php_explode(char *delim, uint delim_len, char *str, uint str_len, zend_uchar str_type, zval *return_value, int limit);

2
ext/standard/quot_print.c
View File

@ -151,7 +151,7 @@ PHPAPI unsigned char *php_quot_print_decode(const unsigned char *str, size_t len
Convert a quoted-printable string to an 8 bit string */
PHP_FUNCTION(quoted_printable_decode)
{
pval **arg1;
zval **arg1;
char *str_in, *str_out;
int i = 0, j = 0, k;

4
ext/standard/reg.c
View File

@ -184,7 +184,7 @@ static void php_reg_eprint(int err, regex_t *re) {
*/
static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
{
pval **regex, /* Regular expression */
zval **regex, /* Regular expression */
**findin, /* String to apply expression to */
**array = NULL; /* Optional register array */
regex_t re;
@ -442,7 +442,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
*/
static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
{
pval **arg_pattern,
zval **arg_pattern,
**arg_replace,
**arg_string;
char *pattern;

8
ext/standard/scanf.c
View File

@ -126,7 +126,7 @@ typedef struct CharSet {
static char *BuildCharSet(CharSet *cset, char *format);
static int CharInSet(CharSet *cset, int ch);
static void ReleaseCharSet(CharSet *cset);
static inline void scan_set_error_return(int numVars, pval **return_value);
static inline void scan_set_error_return(int numVars, zval **return_value);
/* {{{ BuildCharSet
@ -594,7 +594,7 @@ error:
PHPAPI int php_sscanf_internal( char *string, char *format,
int argCount, zval ***args,
int varStart, pval **return_value TSRMLS_DC)
int varStart, zval **return_value TSRMLS_DC)
{
int numVars, nconversions, totalVars = -1;
int i, value, result;
@ -1238,13 +1238,13 @@ done:
/* }}} */
/* the compiler choked when i tried to make this a macro */
static inline void scan_set_error_return(int numVars, pval **return_value)
static inline void scan_set_error_return(int numVars, zval **return_value)
{
if (numVars) {
Z_TYPE_PP(return_value) = IS_LONG;
Z_LVAL_PP(return_value) = SCAN_ERROR_EOF; /* EOF marker */
} else {
/* pval_destructor( *return_value ); */
/* zval_dtor( *return_value ); */
/* convert_to_null calls destructor */
convert_to_null( *return_value );
}

4
ext/standard/scanf.h
View File

@ -42,8 +42,6 @@
* e.g. fscanf
*/
PHPAPI int ValidateFormat(char *format, int numVars, int *totalVars);
PHPAPI int php_sscanf_internal(char *string,char *format,int argCount,zval ***args,
int varStart, pval **return_value TSRMLS_DC);
PHPAPI int php_sscanf_internal(char *string, char *format, int argCount, zval ***args, int varStart, zval **return_value TSRMLS_DC);
#endif /* SCANF_H */

2
ext/standard/string.c
View File

@ -5159,7 +5159,7 @@ PHP_FUNCTION(strip_tags)
Set locale information */
PHP_FUNCTION(setlocale)
{
pval ***args = (pval ***) safe_emalloc(sizeof(pval **), ZEND_NUM_ARGS(), 0);
zval ***args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
zval **pcategory, **plocale;
int i, cat, n_args=ZEND_NUM_ARGS();
char *loc, *retval;

12
ext/standard/type.c
View File

@ -25,7 +25,7 @@
Returns the type of the variable */
PHP_FUNCTION(gettype)
{
pval **arg;
zval **arg;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
@ -99,7 +99,7 @@ PHP_FUNCTION(gettype)
Set the type of the variable */
PHP_FUNCTION(settype)
{
pval **var, **type;
zval **var, **type;
char *new_type;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &var, &type) == FAILURE) {
@ -144,7 +144,7 @@ PHP_FUNCTION(settype)
Get the integer value of a variable using the optional base for the conversion */
PHP_FUNCTION(intval)
{
pval **num, **arg_base;
zval **num, **arg_base;
int base;
switch (ZEND_NUM_ARGS()) {
@ -176,7 +176,7 @@ PHP_FUNCTION(intval)
Get the float value of a variable */
PHP_FUNCTION(floatval)
{
pval **num;
zval **num;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
WRONG_PARAM_COUNT;
@ -211,7 +211,7 @@ PHP_FUNCTION(strval)
static void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type)
{
pval **arg;
zval **arg;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only one argument expected");
@ -312,7 +312,7 @@ PHP_FUNCTION(is_binary)
Returns true if variable is a native, unicode or binary string */
PHP_FUNCTION(is_buffer)
{
pval **arg;
zval **arg;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only one argument expected");

Write Preview
Loading…
Cancel
Save