cvs: /php4/ext/sybase sybase.c /php4/ext/sybase_ct php_sybase_ct.c

zeev Fri Nov 19 08:06:42 1999 EDT Modified files: /php4/ext/sybase sybase.c /php4/ext/sybase_ct php_sybase_ct.c Log: Optimize a bit Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.14 php4/ext/sybase/sybase.c:1.15 --- php4/ext/sybase/sybase.c:1.14 Fri Nov 5 03:48:05 1999 +++ php4/ext/sybase/sybase.c Fri Nov 19 08:06:11 1999 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.14 1999/11/05 08:48:05 thies Exp $ */ +/* $Id: sybase.c,v 1.15 1999/11/19 13:06:11 zeev Exp $ */ #include "php.h" @@ -927,9 +927,10 @@ for (i=0; i<result->num_fields; i++) { MAKE_STD_ZVAL(tmp); *tmp = result->data[result->cur_row][i]; - pval_copy_constructor(tmp); if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) { - tmp->value.str.val = php_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1); + tmp->value.str.val = php_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,0); + } else { + pval_copy_constructor(tmp); } zend_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL); tmp->refcount++; Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.8 php4/ext/sybase_ct/php_sybase_ct.c:1.9 --- php4/ext/sybase_ct/php_sybase_ct.c:1.8 Fri Nov 19 08:00:57 1999 +++ php4/ext/sybase_ct/php_sybase_ct.c Fri Nov 19 08:06:12 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.8 1999/11/19 13:00:57 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.9 1999/11/19 13:06:12 zeev Exp $ */ #include "php.h" @@ -1260,9 +1260,10 @@ tmp = (pval *) emalloc(sizeof(pval)); *tmp = result->data[result->cur_row][i]; INIT_PZVAL(tmp); - pval_copy_constructor(tmp); if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) { - tmp->value.str.val = php_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1); + tmp->value.str.val = php_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,0); + } else { + pval_copy_constructor(tmp); } zend_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL); tmp->refcount++;