mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 03:23:03 +01:00
-Remove GDS_VAL and GDS_REF
This commit is contained in:
parent
5d10d35b75
commit
e2a0b36dbf
@ -136,11 +136,8 @@ int CLIB_ROUTINE main( int argc, char **argv)
|
||||
|
||||
do {
|
||||
db_handle = NULL;
|
||||
status = gds__attach_database(status_vector,
|
||||
0,
|
||||
GDS_VAL(sw_database),
|
||||
GDS_REF(db_handle),
|
||||
sizeof(cache_dpb), GDS_VAL(cache_dpb));
|
||||
status = gds__attach_database(status_vector, 0, sw_database, &db_handle,
|
||||
sizeof(cache_dpb), cache_dpb);
|
||||
|
||||
if (status && status != gds__cache_restart) {
|
||||
gds__print_status(status_vector);
|
||||
@ -148,7 +145,7 @@ int CLIB_ROUTINE main( int argc, char **argv)
|
||||
}
|
||||
|
||||
if (db_handle)
|
||||
gds__detach_database(status_vector, GDS_REF(db_handle));
|
||||
gds__detach_database(status_vector, &db_handle);
|
||||
|
||||
} while (status == gds__cache_restart);
|
||||
|
||||
|
@ -634,7 +634,7 @@ int CLIB_ROUTINE main(int argc, char **argv)
|
||||
|
||||
dpb_length = dpb - dpb_string;
|
||||
|
||||
isc_attach_database(status_vector, 0, GDS_VAL(name), &DB, dpb_length,
|
||||
isc_attach_database(status_vector, 0, name, &DB, dpb_length,
|
||||
(char*) dpb_string);
|
||||
if (status_vector[1])
|
||||
dba_exit(FINI_ERROR, tddba);
|
||||
|
@ -468,12 +468,12 @@ int CLIB_ROUTINE main( int argc, char **argv)
|
||||
|
||||
dpb_length = dpb - dpb_string;
|
||||
|
||||
isc_attach_database(status_vector, 0, GDS_VAL(name), &DB, dpb_length,
|
||||
isc_attach_database(status_vector, 0, name, &DB, dpb_length,
|
||||
dpb_string);
|
||||
if (status_vector[1])
|
||||
dba_full_exit(FINI_ERROR, tddba);
|
||||
#else
|
||||
READY GDS_VAL(name) AS DB;
|
||||
READY name AS DB;
|
||||
ON_ERROR
|
||||
dba_full_exit(FINI_ERROR, tddba);
|
||||
END_ERROR
|
||||
|
@ -49,7 +49,7 @@ ULONG *RMET_tips(TEXT * db_in)
|
||||
**************************************/
|
||||
ULONG last, *tip, *tips;
|
||||
|
||||
READY GDS_VAL(db_in) AS DB
|
||||
READY db_in AS DB
|
||||
ON_ERROR
|
||||
gds__print_status(gds__status);
|
||||
ib_printf("can't open the databse so skip the tip list\n");
|
||||
|
Loading…
Reference in New Issue
Block a user