CVS update: php31/ext/sybase
| From: | zeev | Date: | Fri, 11 Sep 1998 00:22:48 +0000 |
| Subject: | CVS update: php31/ext/sybase | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-959@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
In directory asf:/u2/tmp/cvs-serv334/ext/sybase
Modified Files:
sybase.c
Log Message:
pval naming patch
Index: php31/ext/sybase/sybase.c
diff -c php31/ext/sybase/sybase.c:2.0 php31/ext/sybase/sybase.c:2.1
*** php31/ext/sybase/sybase.c:2.0 Fri Jul 3 09:15:53 1998
--- php31/ext/sybase/sybase.c Thu Sep 10 20:22:47 1998
***************
*** 31,37 ****
+----------------------------------------------------------------------+
*/
! /* $Id: sybase.c,v 2.0 1998/07/03 13:15:53 rasmus Exp $ */
#ifndef MSVC5
--- 31,37 ----
+----------------------------------------------------------------------+
*/
! /* $Id: sybase.c,v 2.1 1998/09/11 00:22:47 zeev Exp $ */
#ifndef MSVC5
***************
*** 155,161 ****
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]);
}
--- 155,161 ----
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]);
}
***************
*** 916,922 ****
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++;
--- 916,922 ----
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++;
***************
*** 929,935 ****
sybase_result *result;
int type;
int i;
! pval *yystype_ptr,tmp;
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
--- 929,935 ----
sybase_result *result;
int type;
int i;
! pval *pval_ptr,tmp;
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
***************
*** 953,964 ****
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
! yystype_copy_constructor(&tmp);
if (php3_ini.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++;
}
--- 953,964 ----
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
! pval_copy_constructor(&tmp);
if (php3_ini.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++;
}
***************
*** 1196,1202 ****
}
*return_value = result->data[row->value.lval][field_offset];
! yystype_copy_constructor(return_value);
}
--- 1196,1202 ----
}
*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