 |
 |
 |
 |
|
|
Date: 06/26/98
- Next message: zeev: "[PHP-DEV] CVS update: php31/ext/gd"
- Previous message: zeev: "[PHP-DEV] CVS update: php31/ext/db"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Friday June 26, 1998 @ 12:52
Author: zeev
Update of /repository/php31/ext/dbase
In directory asf:/tmp/cvs-serv8683/ext/dbase
Modified Files:
dbase.c
Log Message:
I doubt that's all that missing, but here it is anyway
Index: php31/ext/dbase/dbase.c
diff -c php31/ext/dbase/dbase.c:1.1.1.1 php31/ext/dbase/dbase.c:1.2
*** php31/ext/dbase/dbase.c:1.1.1.1 Tue May 26 22:26:53 1998
--- php31/ext/dbase/dbase.c Fri Jun 26 12:52:45 1998
***************
*** 242,248 ****
RETURN_FALSE;
}
! num_fields = hash_num_elements(fields->value.ht);
if (num_fields != dbh->db_nfields) {
php3_error(E_WARNING, "Wrong number of fields specified");
--- 242,248 ----
RETURN_FALSE;
}
! num_fields = _php3_hashnum_elements(fields->value.ht);
if (num_fields != dbh->db_nfields) {
php3_error(E_WARNING, "Wrong number of fields specified");
***************
*** 258,264 ****
dbf = dbh->db_fields;
for (i = 0, cur_f = dbf; cur_f < &dbf[num_fields]; i++, cur_f++) {
! if (hash_index_find(fields->value.ht, i, (void **)&field) == FAILURE) {
php3_error(E_WARNING, "unexpected error");
efree(cp);
RETURN_FALSE;
--- 258,264 ----
dbf = dbh->db_fields;
for (i = 0, cur_f = dbf; cur_f < &dbf[num_fields]; i++, cur_f++) {
! if (_php3_hashindex_find(fields->value.ht, i, (void **)&field) == FAILURE) {
php3_error(E_WARNING, "unexpected error");
efree(cp);
RETURN_FALSE;
***************
*** 411,417 ****
RETURN_FALSE;
}
! num_fields = hash_num_elements(fields->value.ht);
/* have to use regular malloc() because this gets free()d by
code in the dbase library */
--- 411,417 ----
RETURN_FALSE;
}
! num_fields = _php3_hashnum_elements(fields->value.ht);
/* have to use regular malloc() because this gets free()d by
code in the dbase library */
***************
*** 435,441 ****
for (i = 0, cur_f = dbf; i < num_fields; i++, cur_f++) {
/* look up the first field */
! if (hash_index_find(fields->value.ht, i, (void **)&field) == FAILURE) {
php3_error(E_WARNING, "unable to find field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
--- 435,441 ----
for (i = 0, cur_f = dbf; i < num_fields; i++, cur_f++) {
/* look up the first field */
! if (_php3_hashindex_find(fields->value.ht, i, (void **)&field) == FAILURE) {
php3_error(E_WARNING, "unable to find field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
***************
*** 448,454 ****
}
/* field name */
! if (hash_index_find(field->value.ht, 0, (void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field name as first element of list in field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
--- 448,454 ----
}
/* field name */
! if (_php3_hashindex_find(field->value.ht, 0, (void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field name as first element of list in field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
***************
*** 462,468 ****
copy_crimp(cur_f->db_fname, value->value.str.val, value->value.str.len);
/* field type */
! if (hash_index_find(field->value.ht,1,(void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field type as sececond element of list in field %d", i);
RETURN_FALSE;
}
--- 462,468 ----
copy_crimp(cur_f->db_fname, value->value.str.val, value->value.str.len);
/* field type */
! if (_php3_hashindex_find(field->value.ht,1,(void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field type as sececond element of list in field %d", i);
RETURN_FALSE;
}
***************
*** 487,493 ****
case 'N':
case 'C':
/* field length */
! if (hash_index_find(field->value.ht,2,(void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field length as third element of list in field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
--- 487,493 ----
case 'N':
case 'C':
/* field length */
! if (_php3_hashindex_find(field->value.ht,2,(void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field length as third element of list in field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
***************
*** 496,502 ****
cur_f->db_flen = value->value.lval;
if (cur_f->db_type == 'N') {
! if (hash_index_find(field->value.ht,3,(void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field precision as fourth element of list in field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
--- 496,502 ----
cur_f->db_flen = value->value.lval;
if (cur_f->db_type == 'N') {
! if (_php3_hashindex_find(field->value.ht,3,(void **)&value) == FAILURE) {
php3_error(E_WARNING, "expected field precision as fourth element of list in field %d", i);
free_dbf_head(dbh);
RETURN_FALSE;
- Next message: zeev: "[PHP-DEV] CVS update: php31/ext/gd"
- Previous message: zeev: "[PHP-DEV] CVS update: php31/ext/db"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]