cvs: /php4/ext/session session.c /php4/ext/standard php3_var.h var.c /php4/ext/sysvshm sysvshm.c

andrey Mon Sep 20 10:14:27 1999 EDT Modified files: /php4/ext/session session.c /php4/ext/standard php3_var.h var.c /php4/ext/sysvshm sysvshm.c Log: - Upgraded var_dump() to take multiple arguments - php3api_ is changed to php_ Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.54 php4/ext/session/session.c:1.55 --- php4/ext/session/session.c:1.54 Fri Sep 17 05:26:03 1999 +++ php4/ext/session/session.c Mon Sep 20 10:14:25 1999 @@ -153,7 +153,7 @@ == SUCCESS) { snprintf(strbuf, MAX_STR, STD_FMT, key); STR_CAT(buf, strbuf, strlen(strbuf)); - php3api_var_serialize(buf, struc); + php_var_serialize(buf, struc); } else { snprintf(strbuf, MAX_STR, NOTFOUND_FMT, key); STR_CAT(buf, strbuf, strlen(strbuf)); @@ -193,7 +193,7 @@ if(has_value) { current = (pval *) ecalloc(sizeof(pval), 1); - if(php3api_var_unserialize(&current, &q, endptr)) { + if(php_var_unserialize(&current, &q, endptr)) { zend_hash_update(&EG(symbol_table), name, namelen + 1, &current, sizeof(current), NULL); } else { Index: php4/ext/standard/php3_var.h diff -u php4/ext/standard/php3_var.h:1.4 php4/ext/standard/php3_var.h:1.5 --- php4/ext/standard/php3_var.h:1.4 Thu Jul 1 01:47:06 1999 +++ php4/ext/standard/php3_var.h Mon Sep 20 10:14:26 1999 @@ -35,8 +35,8 @@ PHP_FUNCTION(serialize); PHP_FUNCTION(unserialize); -void php3api_var_dump(pval **struc, int level); -void php3api_var_serialize(pval *buf, pval **struc); -int php3api_var_unserialize(pval **rval, const char **p, const char *max); +void php_var_dump(pval **struc, int level); +void php_var_serialize(pval *buf, pval **struc); +int php_var_unserialize(pval **rval, const char **p, const char *max); #endif /* _PHPVAR_H */ Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.27 php4/ext/standard/var.c:1.28 --- php4/ext/standard/var.c:1.27 Mon Sep 20 05:34:39 1999 +++ php4/ext/standard/var.c Mon Sep 20 10:14:26 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.27 1999/09/20 09:34:39 thies Exp $ */ +/* $Id: var.c,v 1.28 1999/09/20 14:14:26 andrey Exp $ */ /* {{{ includes @@ -31,10 +31,9 @@ #include "php3_var.h" /* }}} */ -/* {{{ php3api_var_dump -xmae*/ +/* {{{ php_var_dump */ -void php3api_var_dump(pval **struc, int level) +void php_var_dump(pval **struc, int level) { ulong index; char *key; @@ -96,7 +95,7 @@ d->type = IS_LONG; d->value.lval = index; - php3api_var_dump(&d, level + 2); + php_var_dump(&d, level + 2); efree(d); } break; @@ -107,13 +106,13 @@ d->type = IS_STRING; d->value.str.val = key; d->value.str.len = strlen(key); - php3api_var_dump(&d, level + 2); + php_var_dump(&d, level + 2); efree(key); efree(d); } break; } - php3api_var_dump(data, level + 2); + php_var_dump(data, level + 2); } i = sprintf(buf, "%*c}\n", level, ' '); PHPWRITE(&buf[1], i - 1); @@ -126,20 +125,32 @@ } /* }}} */ -/* {{{ php3api_var_dump */ + +/* {{{ php_var_dump */ PHP_FUNCTION(var_dump) { - pval **struc; - - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &struc) == FAILURE) { + zval ***args; + int argc; + int i; + + argc = ARG_COUNT(ht); + + args = (zval ***)emalloc(argc * sizeof(zval **)); + if (ARG_COUNT(ht) == 0 || getParametersArrayEx(argc, args) == FAILURE) { + efree(args); WRONG_PARAM_COUNT; } - php3api_var_dump(struc, 1); + + for (i=0; i<argc; i++) + php_var_dump(args[i], 1); + + efree(args); } - /* }}} */ -/* {{{ php3api_var_dump */ + + +/* {{{ php_var_dump */ #define STR_CAT(P,S,I) {\ @@ -156,9 +167,9 @@ } /* }}} */ -/* {{{ php3api_var_serialize */ +/* {{{ php_var_serialize */ -void php3api_var_serialize(pval *buf, pval **struc) +void php_var_serialize(pval *buf, pval **struc) { char s[256]; ulong slen; @@ -228,7 +239,7 @@ d = emalloc(sizeof(pval)); d->type = IS_LONG; d->value.lval = index; - php3api_var_serialize(buf, &d); + php_var_serialize(buf, &d); efree(d); break; case HASH_KEY_IS_STRING: @@ -236,12 +247,12 @@ d->type = IS_STRING; d->value.str.val = key; d->value.str.len = strlen(key); - php3api_var_serialize(buf, &d); + php_var_serialize(buf, &d); efree(key); efree(d); break; } - php3api_var_serialize(buf, data); + php_var_serialize(buf, data); } } STR_CAT(buf, "}", 1); @@ -254,9 +265,9 @@ } /* }}} */ -/* {{{ php3api_var_dump */ +/* {{{ php_var_dump */ -int php3api_var_unserialize(pval **rval, const char **p, const char *max) +int php_var_unserialize(pval **rval, const char **p, const char *max) { const char *q; char *str; @@ -405,12 +416,12 @@ pval *key = emalloc(sizeof(pval)); pval *data = emalloc(sizeof(pval)); - if (!php3api_var_unserialize(&key, p, max)) { + if (!php_var_unserialize(&key, p, max)) { efree(key); efree(data); return 0; } - if (!php3api_var_unserialize(&data, p, max)) { + if (!php_var_unserialize(&data, p, max)) { pval_destructor(key); efree(key); efree(data); @@ -447,7 +458,7 @@ return_value->type = IS_STRING; return_value->value.str.val = NULL; return_value->value.str.len = 0; - php3api_var_serialize(return_value, struc); + php_var_serialize(return_value, struc); } /* }}} */ @@ -465,7 +476,7 @@ 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 (!php_var_unserialize(&return_value, &p, p + (*buf)->value.str.len)) { RETURN_FALSE; } } else { Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.7 php4/ext/sysvshm/sysvshm.c:1.8 --- php4/ext/sysvshm/sysvshm.c:1.7 Mon Aug 9 11:03:09 1999 +++ php4/ext/sysvshm/sysvshm.c Mon Sep 20 10:14:26 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.7 1999/08/09 15:03:09 thies Exp $ */ +/* $Id: sysvshm.c,v 1.8 1999/09/20 14:14:26 andrey Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -260,7 +260,7 @@ shm_var.type=IS_STRING; shm_var.value.str.len=0; shm_var.value.str.val=0; - php3api_var_serialize(&shm_var,&arg_var); + php_var_serialize(&shm_var,&arg_var); /* insert serialized variable into shared memory */ ret=php3int_put_shmdata(shm_list_ptr->ptr,key,shm_var.value.str.val,shm_var.value.str.len); @@ -322,7 +322,7 @@ shm_var=(sysvshm_chunk*)((char*)shm_list_ptr->ptr+shm_varpos); shm_data=&shm_var->mem; - if(php3api_var_unserialize(&return_value, (const char **) &shm_data, shm_data+shm_var->length)!=1) { + if(php_var_unserialize(&return_value, (const char **) &shm_data, shm_data+shm_var->length)!=1) { php_error(E_WARNING, "variable data in shared memory is corruped"); RETURN_FALSE; }