CVS update: php3/dl/mssql
| From: | zeev | Date: | Thu, 10 Sep 1998 23:57:15 +0000 |
| Subject: | CVS update: php3/dl/mssql | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-946@lists.php.net to get a copy of this message | ||
Date: Thursday September 10, 1998 @ 19:57
Author: zeev
Update of /repository/php3/dl/mssql
In directory asf:/u2/tmp/cvs-serv29994/dl/mssql
Modified Files:
mssql.c
Log Message:
Clean all remaining leftovers from yystype, convert to pval and fix capitalization on macros
Index: php3/dl/mssql/mssql.c
diff -c php3/dl/mssql/mssql.c:1.5 php3/dl/mssql/mssql.c:1.6
*** php3/dl/mssql/mssql.c:1.5 Thu Sep 10 16:40:18 1998
--- php3/dl/mssql/mssql.c Thu Sep 10 19:57:15 1998
***************
*** 172,178 ****
if (result->data) {
for (i=0; i<result->num_rows; i++) {
for (j=0; j<result->num_fields; j++) {
! php3tls_yystype_destructor(&result->data[i][j]);
}
efree(result->data[i]);
}
--- 172,178 ----
if (result->data) {
for (i=0; i<result->num_rows; i++) {
for (j=0; j<result->num_fields; j++) {
! php3tls_pval_destructor(&result->data[i][j]);
}
efree(result->data[i]);
}
***************
*** 1031,1037 ****
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++;
--- 1031,1037 ----
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++;
***************
*** 1044,1050 ****
mssql_result *result;
int type;
int i;
! pval *yystype_ptr,tmp;
msSQL_TLS_VARS;
--- 1044,1050 ----
mssql_result *result;
int type;
int i;
! pval *pvalue_ptr,tmp;
msSQL_TLS_VARS;
***************
*** 1070,1081 ****
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
! yystype_copy_constructor(&tmp);
if (msSQL_GLOBAL(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++;
}
--- 1070,1081 ----
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
! pval_copy_constructor(&tmp);
if (msSQL_GLOBAL(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 **)
&pvalue_ptr);
! _php3_hash_pointer_update(return_value->value.ht, result->fields[i].name,
strlen(result->fields[i].name)+1, pvalue_ptr);
}
result->cur_row++;
}
***************
*** 1477,1483 ****
}
*return_value = result->data[row->value.lval][field_offset];
! yystype_copy_constructor(return_value);
}
--- 1477,1483 ----
}
*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