CVS update: php31/ext/sybase-ct
| From: | zeev | Date: | Fri, 11 Sep 1998 00:22:49 +0000 |
| Subject: | CVS update: php31/ext/sybase-ct | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-960@lists.php.net to get a copy of this message | ||
Date: Thursday September 10, 1998 @ 20:22
Author: zeev
Update of /repository/php31/ext/sybase-ct
In directory asf:/u2/tmp/cvs-serv334/ext/sybase-ct
Modified Files:
sybase-ct.c
Log Message:
pval naming patch
Index: php31/ext/sybase-ct/sybase-ct.c
diff -c php31/ext/sybase-ct/sybase-ct.c:1.3 php31/ext/sybase-ct/sybase-ct.c:1.4
*** php31/ext/sybase-ct/sybase-ct.c:1.3 Sun Sep 6 17:34:32 1998
--- php31/ext/sybase-ct/sybase-ct.c Thu Sep 10 20:22:49 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: sybase-ct.c,v 1.3 1998/09/06 21:34:32 zeev Exp $ */
#ifndef MSVC5
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: sybase-ct.c,v 1.4 1998/09/11 00:22:49 zeev Exp $ */
#ifndef MSVC5
***************
*** 117,123 ****
if (result->data) {
for (i=0; i<result->num_rows; i++) {
for (j=0; j<result->num_fields; j++) {
! yystype_destructor(&result->data[i][j]);
}
efree(result->data[i]);
}
--- 117,123 ----
if (result->data) {
for (i=0; i<result->num_rows; i++) {
for (j=0; j<result->num_fields; j++) {
! pval_destructor(&result->data[i][j]);
}
efree(result->data[i]);
}
***************
*** 978,984 ****
array_init(return_value);
for (i=0; i<result->num_fields; i++) {
field_content = result->data[result->cur_row][i];
! yystype_copy_constructor(&field_content);
_php3_hash_index_update(return_value->value.ht, i, (void *) &field_content,
sizeof(pval),NULL);
}
result->cur_row++;
--- 978,984 ----
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);
}
result->cur_row++;
***************
*** 991,997 ****
sybct_result *result;
int type;
int i;
! pval *yystype_ptr,tmp;
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybct_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
--- 991,997 ----
sybct_result *result;
int type;
int i;
! pval *pval_ptr,tmp;
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybct_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
***************
*** 1015,1026 ****
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
! yystype_copy_constructor(&tmp);
if (php3_ini_master.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 **)
&yystype_ptr);
! _php3_hash_pointer_update(return_value->value.ht, result->fields[i].name,
strlen(result->fields[i].name)+1, yystype_ptr);
}
result->cur_row++;
}
--- 1015,1026 ----
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
! pval_copy_constructor(&tmp);
if (php3_ini_master.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);
}
result->cur_row++;
}
***************
*** 1256,1262 ****
}
*return_value = result->data[row->value.lval][field_offset];
! yystype_copy_constructor(return_value);
}
--- 1256,1262 ----
}
*return_value = result->data[row->value.lval][field_offset];
! 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