CVS update: php31/ext/standard
| From: | zeev | Date: | Fri, 11 Sep 1998 00:22:46 +0000 |
| Subject: | CVS update: php31/ext/standard | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-958@lists.php.net to get a copy of this message | ||
Date: Thursday September 10, 1998 @ 20:22
Author: zeev
Update of /repository/php31/ext/standard
In directory asf:/u2/tmp/cvs-serv334/ext/standard
Modified Files:
basic_functions.c browscap.c dns.c exec.c fsock.c reg.c
string.c
Log Message:
pval naming patch
Index: php31/ext/standard/basic_functions.c
diff -c php31/ext/standard/basic_functions.c:2.12 php31/ext/standard/basic_functions.c:2.13
*** php31/ext/standard/basic_functions.c:2.12 Sun Sep 6 17:34:30 1998
--- php31/ext/standard/basic_functions.c Thu Sep 10 20:22:42 1998
***************
*** 517,523 ****
}
convert_to_string(num);
*return_value = *num;
! yystype_copy_constructor(return_value);
}
static int array_key_compare(const void *a, const void *b)
--- 517,523 ----
}
convert_to_string(num);
*return_value = *num;
! pval_copy_constructor(return_value);
}
static int array_key_compare(const void *a, const void *b)
***************
*** 849,855 ****
}
}
*return_value = *entry;
! yystype_copy_constructor(return_value);
}
--- 849,855 ----
}
}
*return_value = *entry;
! pval_copy_constructor(return_value);
}
***************
*** 872,878 ****
} while (entry->type==IS_STRING &&
entry->value.str.val==undefined_variable_string);
*return_value = *entry;
! yystype_copy_constructor(return_value);
}
void array_next(INTERNAL_FUNCTION_PARAMETERS)
--- 872,878 ----
} while (entry->type==IS_STRING &&
entry->value.str.val==undefined_variable_string);
*return_value = *entry;
! pval_copy_constructor(return_value);
}
void array_next(INTERNAL_FUNCTION_PARAMETERS)
***************
*** 894,900 ****
} while (entry->type==IS_STRING &&
entry->value.str.val==undefined_variable_string);
*return_value = *entry;
! yystype_copy_constructor(return_value);
}
void array_each(INTERNAL_FUNCTION_PARAMETERS)
--- 894,900 ----
} while (entry->type==IS_STRING &&
entry->value.str.val==undefined_variable_string);
*return_value = *entry;
! pval_copy_constructor(return_value);
}
void array_each(INTERNAL_FUNCTION_PARAMETERS)
***************
*** 925,931 ****
}
array_init(return_value);
real_entry = *entry;
! yystype_copy_constructor(&real_entry);
_php3_hash_index_update(return_value->value.ht,1,(void *) &real_entry,sizeof(pval),(void
**) &inserted_pointer);
_php3_hash_pointer_update(return_value->value.ht, "value",
sizeof("value"), (void *) inserted_pointer);
switch (_php3_hash_get_current_key(array->value.ht, &string_key, &int_key)) {
--- 925,931 ----
}
array_init(return_value);
real_entry = *entry;
! pval_copy_constructor(&real_entry);
_php3_hash_index_update(return_value->value.ht,1,(void *) &real_entry,sizeof(pval),(void
**) &inserted_pointer);
_php3_hash_pointer_update(return_value->value.ht, "value",
sizeof("value"), (void *) inserted_pointer);
switch (_php3_hash_get_current_key(array->value.ht, &string_key, &int_key)) {
***************
*** 964,970 ****
}
*return_value = *entry;
! yystype_copy_constructor(return_value);
}
void array_current(INTERNAL_FUNCTION_PARAMETERS)
--- 964,970 ----
}
*return_value = *entry;
! pval_copy_constructor(return_value);
}
void array_current(INTERNAL_FUNCTION_PARAMETERS)
***************
*** 982,988 ****
return;
}
*return_value = *entry;
! yystype_copy_constructor(return_value);
}
--- 982,988 ----
return;
}
*return_value = *entry;
! pval_copy_constructor(return_value);
}
***************
*** 1142,1148 ****
}
if (_php3_hash_minmax(arr->value.ht, array_data_compare, 0, (void **) &result)==SUCCESS)
{
*return_value = *result;
! yystype_copy_constructor(return_value);
} else {
php3_error(E_WARNING, "min: array must contain at least 1 element");
var_uninit(return_value);
--- 1142,1148 ----
}
if (_php3_hash_minmax(arr->value.ht, array_data_compare, 0, (void **) &result)==SUCCESS)
{
*return_value = *result;
! pval_copy_constructor(return_value);
} else {
php3_error(E_WARNING, "min: array must contain at least 1 element");
var_uninit(return_value);
***************
*** 1150,1156 ****
} else {
if (_php3_hash_minmax(ht, array_data_compare, 0, (void **) &result)==SUCCESS) {
*return_value = *result;
! yystype_copy_constructor(return_value);
}
}
}
--- 1150,1156 ----
} else {
if (_php3_hash_minmax(ht, array_data_compare, 0, (void **) &result)==SUCCESS) {
*return_value = *result;
! pval_copy_constructor(return_value);
}
}
}
***************
*** 1176,1182 ****
}
if (_php3_hash_minmax(arr->value.ht, array_data_compare, 1, (void **) &result)==SUCCESS)
{
*return_value = *result;
! yystype_copy_constructor(return_value);
} else {
php3_error(E_WARNING, "max: array must contain at least 1 element");
var_uninit(return_value);
--- 1176,1182 ----
}
if (_php3_hash_minmax(arr->value.ht, array_data_compare, 1, (void **) &result)==SUCCESS)
{
*return_value = *result;
! pval_copy_constructor(return_value);
} else {
php3_error(E_WARNING, "max: array must contain at least 1 element");
var_uninit(return_value);
***************
*** 1184,1190 ****
} else {
if (_php3_hash_minmax(ht, array_data_compare, 1, (void **) &result)==SUCCESS) {
*return_value = *result;
! yystype_copy_constructor(return_value);
}
}
}
--- 1184,1190 ----
} else {
if (_php3_hash_minmax(ht, array_data_compare, 1, (void **) &result)==SUCCESS) {
*return_value = *result;
! pval_copy_constructor(return_value);
}
}
}
***************
*** 1549,1557 ****
TLS_VARS;
if (call_user_function(&GLOBAL(function_table), NULL, user_shutdown_function_name,
&retval, 0, NULL)==SUCCESS) {
! yystype_destructor(&retval _INLINE_TLS);
}
! yystype_destructor(user_shutdown_function_name _INLINE_TLS);
}
--- 1549,1557 ----
TLS_VARS;
if (call_user_function(&GLOBAL(function_table), NULL, user_shutdown_function_name,
&retval, 0, NULL)==SUCCESS) {
! pval_destructor(&retval _INLINE_TLS);
}
! pval_destructor(user_shutdown_function_name _INLINE_TLS);
}
***************
*** 1583,1589 ****
}
shutdown_function_name = *arg;
! yystype_copy_constructor(&shutdown_function_name);
_php3_hash_next_index_insert(user_shutdown_function_names, &shutdown_function_name,
sizeof(pval), NULL);
}
--- 1583,1589 ----
}
shutdown_function_name = *arg;
! pval_copy_constructor(&shutdown_function_name);
_php3_hash_next_index_insert(user_shutdown_function_names, &shutdown_function_name,
sizeof(pval), NULL);
}
Index: php31/ext/standard/browscap.c
diff -c php31/ext/standard/browscap.c:2.0 php31/ext/standard/browscap.c:2.1
*** php31/ext/standard/browscap.c:2.0 Fri Jul 3 09:14:19 1998
--- php31/ext/standard/browscap.c Thu Sep 10 20:22:43 1998
***************
*** 115,128 ****
*return_value = *agent;
return_value->type = IS_OBJECT;
! yystype_copy_constructor(return_value);
! return_value->value.ht->pDestructor = pval_DESTRUCTOR;
while (_php3_hash_find(agent->value.ht, "parent", sizeof("parent"), (void
**) &agent_name)==SUCCESS) {
if (_php3_hash_find(&GLOBAL(browser_hash), agent_name->value.str.val,
agent_name->value.str.len+1, (void **) &agent)==FAILURE) {
break;
}
! _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData))
yystype_copy_constructor, (void *) &tmp, sizeof(pval));
}
}
--- 115,128 ----
*return_value = *agent;
return_value->type = IS_OBJECT;
! pval_copy_constructor(return_value);
! return_value->value.ht->pDestructor = PVAL_DESTRUCTOR;
while (_php3_hash_find(agent->value.ht, "parent", sizeof("parent"), (void
**) &agent_name)==SUCCESS) {
if (_php3_hash_find(&GLOBAL(browser_hash), agent_name->value.str.val,
agent_name->value.str.len+1, (void **) &agent)==FAILURE) {
break;
}
! _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData))
pval_copy_constructor, (void *) &tmp, sizeof(pval));
}
}
Index: php31/ext/standard/dns.c
diff -c php31/ext/standard/dns.c:2.0 php31/ext/standard/dns.c:2.1
*** php31/ext/standard/dns.c:2.0 Fri Jul 3 09:14:21 1998
--- php31/ext/standard/dns.c Thu Sep 10 20:22:43 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: dns.c,v 2.0 1998/07/03 13:14:21 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: dns.c,v 2.1 1998/09/11 00:22:43 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 257,263 ****
RETURN_FALSE;
}
need_weight = 1;
! yystype_destructor(weight_list _INLINE_TLS); /* start with clean array */
if ( array_init(weight_list) == FAILURE ) {
RETURN_FALSE;
}
--- 257,263 ----
RETURN_FALSE;
}
need_weight = 1;
! pval_destructor(weight_list _INLINE_TLS); /* start with clean array */
if ( array_init(weight_list) == FAILURE ) {
RETURN_FALSE;
}
***************
*** 267,273 ****
}
convert_to_string( host );
! yystype_destructor(mx_list _INLINE_TLS); /* start with clean array */
if ( array_init(mx_list) == FAILURE ) {
RETURN_FALSE;
}
--- 267,273 ----
}
convert_to_string( host );
! pval_destructor(mx_list _INLINE_TLS); /* start with clean array */
if ( array_init(mx_list) == FAILURE ) {
RETURN_FALSE;
}
Index: php31/ext/standard/exec.c
diff -c php31/ext/standard/exec.c:2.1 php31/ext/standard/exec.c:2.2
*** php31/ext/standard/exec.c:2.1 Fri Aug 14 13:29:59 1998
--- php31/ext/standard/exec.c Thu Sep 10 20:22:44 1998
***************
*** 26,32 ****
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
! /* $Id: exec.c,v 2.1 1998/08/14 17:29:59 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 26,32 ----
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
! /* $Id: exec.c,v 2.2 1998/09/11 00:22:44 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 117,123 ****
}
if (type==2) {
if (array->type != IS_ARRAY) {
! yystype_destructor(array _INLINE_TLS);
array_init(array);
}
}
--- 117,123 ----
}
if (type==2) {
if (array->type != IS_ARRAY) {
! pval_destructor(array _INLINE_TLS);
array_init(array);
}
}
Index: php31/ext/standard/fsock.c
diff -c php31/ext/standard/fsock.c:2.0 php31/ext/standard/fsock.c:2.1
*** php31/ext/standard/fsock.c:2.0 Fri Jul 3 09:14:24 1998
--- php31/ext/standard/fsock.c Thu Sep 10 20:22:45 1998
***************
*** 27,33 ****
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: fsock.c,v 2.0 1998/07/03 13:14:24 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: fsock.c,v 2.1 1998/09/11 00:22:45 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 119,125 ****
if(!ParameterPassedByReference(ht,4)) {
php3_error(E_WARNING,"error string argument to fsockopen not passed by reference");
}
! yystype_copy_constructor(args[3]);
args[3]->value.str.val = empty_string;
args[3]->value.str.len = 0;
args[3]->type = IS_STRING;
--- 119,125 ----
if(!ParameterPassedByReference(ht,4)) {
php3_error(E_WARNING,"error string argument to fsockopen not passed by reference");
}
! pval_copy_constructor(args[3]);
args[3]->value.str.val = empty_string;
args[3]->value.str.len = 0;
args[3]->type = IS_STRING;
Index: php31/ext/standard/reg.c
diff -c php31/ext/standard/reg.c:2.2 php31/ext/standard/reg.c:2.3
*** php31/ext/standard/reg.c:2.2 Fri Sep 4 11:32:11 1998
--- php31/ext/standard/reg.c Thu Sep 10 20:22:45 1998
***************
*** 28,34 ****
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 2.2 1998/09/04 15:32:11 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 28,34 ----
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 2.3 1998/09/11 00:22:45 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 179,185 ****
RETURN_FALSE;
}
! yystype_destructor(array _INLINE_TLS); /* start with clean array */
array_init(array);
for (i = 0; i < NS; i++) {
--- 179,185 ----
RETURN_FALSE;
}
! pval_destructor(array _INLINE_TLS); /* start with clean array */
array_init(array);
for (i = 0; i < NS; i++) {
Index: php31/ext/standard/string.c
diff -c php31/ext/standard/string.c:2.2 php31/ext/standard/string.c:2.3
*** php31/ext/standard/string.c:2.2 Fri Sep 4 11:32:12 1998
--- php31/ext/standard/string.c Thu Sep 10 20:22:46 1998
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 2.2 1998/09/04 15:32:12 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 2.3 1998/09/11 00:22:46 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 808,814 ****
}
*return_value = *str;
! yystype_copy_constructor(return_value);
}
--- 808,814 ----
}
*return_value = *str;
! pval_copy_constructor(return_value);
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net