cvs: php4 /ext/session php_session.h session.c

zeev Thu Dec 6 08:33:10 2001 EDT Modified files: /php4/ext/session php_session.h session.c Log: Remove PS_DEL_VAR macro, always use PS_DEL_VARL() Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.63 php4/ext/session/php_session.h:1.64 --- php4/ext/session/php_session.h:1.63 Sun Nov 18 15:08:43 2001 +++ php4/ext/session/php_session.h Thu Dec 6 08:33:10 2001 @@ -169,8 +169,6 @@ #define PS_DEL_VARL(name,namelen) \ zend_hash_del(&PS(vars), name, namelen + 1); -#define PS_DEL_VAR(name) PS_DEL_VARL(name, strlen(name)) - #define PS_ENCODE_VARS \ char *key; \ uint key_length; \ Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.265 php4/ext/session/session.c:1.266 --- php4/ext/session/session.c:1.265 Tue Dec 4 17:57:16 2001 +++ php4/ext/session/session.c Thu Dec 6 08:33:10 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.265 2001/12/04 22:57:16 hholzgra Exp $ */ +/* $Id: session.c,v 1.266 2001/12/06 13:33:10 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1276,7 +1276,7 @@ convert_to_string_ex(p_name); - PS_DEL_VAR(Z_STRVAL_PP(p_name)); + PS_DEL_VARL(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name)); RETURN_TRUE; }