cvs: /php4/ext/sybase sybase-ct.c sybase.c

zeev Fri Jul 16 18:00:51 1999 EDT Modified files: /php4/ext/sybase sybase-ct.c sybase.c Log: Get the Sybase modules uptodate Index: php4/ext/sybase/sybase-ct.c diff -u php4/ext/sybase/sybase-ct.c:1.5 php4/ext/sybase/sybase-ct.c:1.6 --- php4/ext/sybase/sybase-ct.c:1.5 Fri Jul 16 09:12:57 1999 +++ php4/ext/sybase/sybase-ct.c Fri Jul 16 18:00:50 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase-ct.c,v 1.5 1999/07/16 13:12:57 zeev Exp $ */ +/* $Id: sybase-ct.c,v 1.6 1999/07/16 22:00:50 zeev Exp $ */ #ifndef MSVC5 @@ -1246,7 +1246,7 @@ pval *sybct_result_index; int type,i,id; sybct_result *result; - pval field_content; + pval *field_content; if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybct_result_index)==FAILURE) { WRONG_PARAM_COUNT; @@ -1267,9 +1267,11 @@ array_init(return_value); for (i=0; i<result->num_fields; i++) { - field_content = result->data[result->cur_row][i]; - pval_copy_constructor(&field_content); - _php3_hash_index_update(return_value->value.ht, i, (void *) &field_content, sizeof(pval),NULL); + field_content = (pval *) emalloc(sizeof(pval)); + *field_content = result->data[result->cur_row][i]; + INIT_PZVAL(field_content); + pval_copy_constructor(field_content); + _php3_hash_index_update(return_value->value.ht, i, (void *) &field_content, sizeof(pval* ), NULL); } result->cur_row++; } @@ -1281,7 +1283,7 @@ sybct_result *result; int type; int i; - pval *pval_ptr,tmp; + pval *tmp; PLS_FETCH(); if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybct_result_index)==FAILURE) { @@ -1305,13 +1307,15 @@ } for (i=0; i<result->num_fields; i++) { - tmp = result->data[result->cur_row][i]; - pval_copy_constructor(&tmp); - if (PG(magic_quotes_runtime) && tmp.type == IS_STRING) { - tmp.value.str.val = _php3_addslashes(tmp.value.str.val,tmp.value.str.len,&tmp.value.str.len,1); + 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 = _php3_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1); } - _php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval), (void **) &pval_ptr); - _php3_hash_pointer_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, pval_ptr); + _php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL); + _php3_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &tmp, sizeof(pval *) NULL); } result->cur_row++; } Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.7 php4/ext/sybase/sybase.c:1.8 --- php4/ext/sybase/sybase.c:1.7 Fri Jul 16 09:12:57 1999 +++ php4/ext/sybase/sybase.c Fri Jul 16 18:00:51 1999 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.7 1999/07/16 13:12:57 zeev Exp $ */ +/* $Id: sybase.c,v 1.8 1999/07/16 22:00:51 zeev Exp $ */ #ifndef MSVC5 @@ -867,7 +867,7 @@ pval *sybase_result_index; int type,i,id; sybase_result *result; - pval field_content; + pval *field_content; if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) { WRONG_PARAM_COUNT; @@ -888,9 +888,10 @@ array_init(return_value); for (i=0; i<result->num_fields; i++) { - field_content = result->data[result->cur_row][i]; - pval_copy_constructor(&field_content); - _php3_hash_index_update(return_value->value.ht, i, (void *) &field_content, sizeof(pval),NULL); + MAKE_STD_ZVAL(field_content); + *field_content = result->data[result->cur_row][i]; + pval_copy_constructor(field_content); + _php3_hash_index_update(return_value->value.ht, i, (void *) &field_content, sizeof(pval *), NULL); } result->cur_row++; } @@ -902,7 +903,7 @@ sybase_result *result; int type; int i; - pval *pval_ptr,tmp; + pval *tmp; if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) { WRONG_PARAM_COUNT; @@ -925,13 +926,15 @@ } for (i=0; i<result->num_fields; i++) { - tmp = result->data[result->cur_row][i]; - pval_copy_constructor(&tmp); - if (PG(magic_quotes_runtime) && tmp.type == IS_STRING) { - tmp.value.str.val = _php3_addslashes(tmp.value.str.val,tmp.value.str.len,&tmp.value.str.len,1); - } - _php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval), (void **) &pval_ptr); - _php3_hash_pointer_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, pval_ptr); + 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 = _php3_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1); + } + _php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL); + tmp->refcount++; + _php3_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &tmp, sizeof(pval *), NULL); } result->cur_row++; }