mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

use new API in var.c

Browse Source
This commit is contained in:
Thies C. Arntzen 1999-09-15 11:42:28 +00:00
parent 21a0c57cb1
commit e7ad3bbec2
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,8 +2,8 @@ PHP 4.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ?? 1999, Version 4.0 Beta 3
- Made serialize/unserialize work on classes. CAUTION: when unserializing the
class to be unserialized needs to be known! (Thies)
- Made serialize/unserialize work on classes & speedups. CAUTION: when
unserializing the class to be unserialized needs to be known! (Thies)
- Reworked preg_* functions according to the new PCRE API, which also made
them behave much more like Perl ones (Andrey)
- Made it possible to specify external location of PCRE library (Andrey)

18
ext/standard/var.c
View File

@ -431,17 +431,16 @@ int php3api_var_unserialize(pval **rval, const char **p, const char *max)
/* {{{ proto string serialize(mixed variable)
Returns a string representation of variable (which can later be unserialized) */
PHP_FUNCTION(serialize)
{
pval *struc;
pval **struc;
if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &struc) == FAILURE) {
if (ARG_COUNT(ht) != 1 || getParametersEx(1, &struc) == FAILURE) {
WRONG_PARAM_COUNT;
}
return_value->type = IS_STRING;
return_value->value.str.val = NULL;
return_value->value.str.len = 0;
php3api_var_serialize(return_value, &struc);
php3api_var_serialize(return_value, struc);
}
/* }}} */
@ -451,14 +450,15 @@ PHP_FUNCTION(serialize)
PHP_FUNCTION(unserialize)
{
pval *buf;
pval **buf;
if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &buf) == FAILURE) {
if (ARG_COUNT(ht) != 1 || getParametersEx(1, &buf) == FAILURE) {
WRONG_PARAM_COUNT;
}
if (buf->type == IS_STRING) {
const char *p = buf->value.str.val;
if (!php3api_var_unserialize(&return_value, &p, p + buf->value.str.len)) {
if ((*buf)->type == IS_STRING) {
const char *p = (*buf)->value.str.val;
if (!php3api_var_unserialize(&return_value, &p, p + (*buf)->value.str.len)) {
RETURN_FALSE;
}
} else {