firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 01:23:03 +01:00
Code Issues

-Remove GDS_VAL and GDS_REF

Browse Source
This commit is contained in:
brodsom 2003-08-30 02:02:36 +00:00
parent 9341ca667b
commit d034fe82c6
6 changed files with 197 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/alice/alice_meta.epp
View File

@ -27,7 +27,7 @@
* *
*____________________________________________________________ *____________________________________________________________
* *
* $Id: alice_meta.epp,v 1.12 2003-08-27 10:15:11 aafemt Exp $ * $Id: alice_meta.epp,v 1.13 2003-08-30 02:02:36 brodsom Exp $
*/ */
#include "firebird.h" #include "firebird.h"
@ -144,7 +144,7 @@ void MET_get_state(ISC_STATUS * user_status, TDR trans)
trans->tdr_state = TRA.RDB$TRANSACTION_STATE; trans->tdr_state = TRA.RDB$TRANSACTION_STATE;
END_FOR ON_ERROR RETURN_ERROR(user_status) END_ERROR; END_FOR ON_ERROR RETURN_ERROR(user_status) END_ERROR;
gds__release_request(gds_status, GDS_REF(request)); gds__release_request(gds_status, &request);
if (gds_status[1]) { if (gds_status[1]) {
RETURN_ERROR(user_status) RETURN_ERROR(user_status)
} }
@ -184,7 +184,7 @@ TDR MET_get_transaction(ISC_STATUS * user_status, isc_db_handle handle, SLONG id
trans = get_description((SLONG*)&TRA.RDB$TRANSACTION_DESCRIPTION); trans = get_description((SLONG*)&TRA.RDB$TRANSACTION_DESCRIPTION);
END_FOR ON_ERROR RETURN_ERROR(user_status) END_ERROR; END_FOR ON_ERROR RETURN_ERROR(user_status) END_ERROR;
gds__release_request(gds_status, GDS_REF(request)); gds__release_request(gds_status, &request);
if (gds_status[1]) { if (gds_status[1]) {
RETURN_ERROR(user_status) RETURN_ERROR(user_status)
} }
@ -281,7 +281,7 @@ static USHORT get_capabilities(ISC_STATUS * user_status)
END_FOR ON_ERROR RETURN_ERROR(user_status) END_ERROR; END_FOR ON_ERROR RETURN_ERROR(user_status) END_ERROR;
} }
gds__release_request(gds_status, GDS_REF(req)); gds__release_request(gds_status, &req);
if (gds_status[1]) { if (gds_status[1]) {
RETURN_ERROR(user_status) RETURN_ERROR(user_status)
} }
@ -459,9 +459,7 @@ static USHORT snarf_blob(SLONG blob_id[2],
buffer[1] = 0; buffer[1] = 0;
blob = NULL; blob = NULL;
if (gds__open_blob(gds_status, if (gds__open_blob(gds_status, &DB, &gds_trans, &blob, (GDS_QUAD*) blob_id)) {
GDS_REF(DB),
GDS_REF(gds_trans), GDS_REF(blob), (GDS_QUAD*) GDS_VAL(blob_id))) {
ALICE_print_status(gds_status); ALICE_print_status(gds_status);
return 0; return 0;
} }
@ -475,10 +473,8 @@ static USHORT snarf_blob(SLONG blob_id[2],
break; break;
if (!(buffer_length = end - ptr)) if (!(buffer_length = end - ptr))
break; break;
status = gds__get_segment(gds_status, status = gds__get_segment(gds_status, &blob, &returned_length,
GDS_REF(blob), buffer_length, ptr);
GDS_REF(returned_length),
buffer_length, GDS_VAL(ptr));
if (status && status != gds_segment) if (status && status != gds_segment)
break; break;
ptr += returned_length; ptr += returned_length;
@ -488,9 +484,7 @@ static USHORT snarf_blob(SLONG blob_id[2],
if (!buffer_length) if (!buffer_length)
for (;;) { for (;;) {
status = gds__get_segment(gds_status, status = gds__get_segment(gds_status, &blob, &returned_length,
GDS_REF(blob),
GDS_REF(returned_length),
buffer_length, buffer); buffer_length, buffer);
if (status && status != gds_segment) if (status && status != gds_segment)
break; break;
@ -499,7 +493,7 @@ static USHORT snarf_blob(SLONG blob_id[2],
else else
buffer_length = 0; buffer_length = 0;
gds__close_blob(gds_status, GDS_REF(blob)); gds__close_blob(gds_status, &blob);
*ptr = 0; *ptr = 0;

31
src/alice/exe.cpp
View File

@ -24,7 +24,7 @@
// //
//____________________________________________________________ //____________________________________________________________
// //
// $Id: exe.cpp,v 1.12 2003-03-13 16:54:03 skidder Exp $ // $Id: exe.cpp,v 1.13 2003-08-30 02:02:36 brodsom Exp $
// //
// 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE" // 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
// conditionals, as the engine now fully supports // conditionals, as the engine now fully supports
@ -100,12 +100,8 @@ int EXE_action(TEXT * database, ULONG switches)
error = FALSE; error = FALSE;
handle = NULL; handle = NULL;
gds__attach_database(tdgbl->status, gds__attach_database(tdgbl->status, 0, database, &handle, dpb_length,
0, reinterpret_cast <SCHAR *>(dpb));
GDS_VAL(database),
(GDS_REF(handle)),
dpb_length,
reinterpret_cast <SCHAR *>(GDS_VAL(dpb)));
SVC_STARTED(tdgbl->service_blk); SVC_STARTED(tdgbl->service_blk);
@ -117,11 +113,8 @@ int EXE_action(TEXT * database, ULONG switches)
if (handle != NULL) { if (handle != NULL) {
if ((switches & sw_validate) && (tdgbl->status[1] != isc_bug_check)) { if ((switches & sw_validate) && (tdgbl->status[1] != isc_bug_check)) {
gds__database_info(tdgbl->status, gds__database_info(tdgbl->status, &handle, sizeof(val_errors),
(GDS_REF(handle)), val_errors, sizeof(error_string),
sizeof(val_errors),
val_errors,
sizeof(error_string),
reinterpret_cast < char *>(error_string)); reinterpret_cast < char *>(error_string));
extract_db_info(error_string); extract_db_info(error_string);
@ -130,8 +123,7 @@ int EXE_action(TEXT * database, ULONG switches)
if (switches & sw_disable) if (switches & sw_disable)
MET_disable_wal(tdgbl->status, handle); MET_disable_wal(tdgbl->status, handle);
gds__detach_database(tdgbl->status, gds__detach_database(tdgbl->status, &handle);
(GDS_REF(handle)));
} }
ALLA_fini(); ALLA_fini();
@ -166,12 +158,8 @@ int EXE_two_phase(TEXT * database, ULONG switches)
error = FALSE; error = FALSE;
handle = NULL; handle = NULL;
gds__attach_database(tdgbl->status, gds__attach_database(tdgbl->status, 0, database, &handle,
0, dpb_length, reinterpret_cast < char *>(dpb));
GDS_VAL(database),
(GDS_REF(handle)),
dpb_length,
reinterpret_cast < char *>(GDS_VAL(dpb)));
SVC_STARTED(tdgbl->service_blk); SVC_STARTED(tdgbl->service_blk);
@ -186,8 +174,7 @@ int EXE_two_phase(TEXT * database, ULONG switches)
switches); switches);
if (handle) if (handle)
gds__detach_database(tdgbl->status, gds__detach_database(tdgbl->status, &handle);
(GDS_REF(handle)));
ALLA_fini(); ALLA_fini();

30
src/alice/tdr.cpp
View File

@ -24,7 +24,7 @@
// //
//____________________________________________________________ //____________________________________________________________
// //
// $Id: tdr.cpp,v 1.17 2003-04-16 10:16:30 aafemt Exp $ // $Id: tdr.cpp,v 1.18 2003-08-30 02:02:36 brodsom Exp $
// //
// 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "Apollo" port // 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "Apollo" port
// //
@ -222,11 +222,9 @@ BOOLEAN TDR_attach_database(ISC_STATUS * status_vector,
trans->tdr_db_handle = NULL; trans->tdr_db_handle = NULL;
gds__attach_database(status_vector, gds__attach_database(status_vector, 0, pathname,
0, &trans->tdr_db_handle, dpb_length,
GDS_VAL(pathname), reinterpret_cast < char *>(dpb));
(GDS_REF(trans->tdr_db_handle)), dpb_length,
reinterpret_cast < char *>(GDS_VAL(dpb)));
if (status_vector[1]) { if (status_vector[1]) {
if (tdgbl->ALICE_data.ua_debug) { if (tdgbl->ALICE_data.ua_debug) {
@ -275,8 +273,7 @@ void TDR_shutdown_databases(TDR trans)
ISC_STATUS_ARRAY status_vector; ISC_STATUS_ARRAY status_vector;
for (ptr = trans; ptr; ptr = ptr->tdr_next) for (ptr = trans; ptr; ptr = ptr->tdr_next)
gds__detach_database(status_vector, gds__detach_database(status_vector, &ptr->tdr_db_handle);
(GDS_REF(ptr->tdr_db_handle)));
} }
@ -304,9 +301,7 @@ void TDR_list_limbo(FRBRD *handle, TEXT * name, ULONG switches)
tdgbl = GET_THREAD_DATA; tdgbl = GET_THREAD_DATA;
if (gds__database_info(status_vector, if (gds__database_info(status_vector, &handle, sizeof(limbo_info),
(GDS_REF(handle)),
sizeof(limbo_info),
reinterpret_cast < char *>(limbo_info), reinterpret_cast < char *>(limbo_info),
sizeof(buffer), sizeof(buffer),
reinterpret_cast < char *>(buffer))) { reinterpret_cast < char *>(buffer))) {
@ -882,11 +877,8 @@ static BOOLEAN reconnect(FRBRD *handle,
id = gds__vax_integer((UCHAR *) & number, 4); id = gds__vax_integer((UCHAR *) & number, 4);
transaction = NULL; transaction = NULL;
if (gds__reconnect_transaction(status_vector, if (gds__reconnect_transaction(status_vector, &handle, &transaction,
(GDS_REF(handle)), sizeof(id), reinterpret_cast <char *>(&id))) {
(GDS_REF(transaction)),
sizeof(id),
reinterpret_cast <char *>(GDS_REF(id)))) {
ALICE_print(90, name, 0, 0, 0, 0); /* msg 90: failed to reconnect to a transaction in database %s */ ALICE_print(90, name, 0, 0, 0, 0); /* msg 90: failed to reconnect to a transaction in database %s */
ALICE_print_status(status_vector); ALICE_print_status(status_vector);
return TRUE; return TRUE;
@ -902,11 +894,9 @@ static BOOLEAN reconnect(FRBRD *handle,
} }
if (switches & sw_commit) if (switches & sw_commit)
gds__commit_transaction(status_vector, gds__commit_transaction(status_vector, &transaction);
(GDS_REF(transaction)));
else if (switches & sw_rollback) else if (switches & sw_rollback)
gds__rollback_transaction(status_vector, gds__rollback_transaction(status_vector, &transaction);
(GDS_REF(transaction)));
else else
return FALSE; return FALSE;

267
src/dudley/exe.epp
View File

@ -217,14 +217,15 @@ void EXE_create_database( DBB dbb)
file_name = dbb->dbb_name->sym_string; file_name = dbb->dbb_name->sym_string;
result = gds__attach_database(gds_status, 0, GDS_VAL(file_name), result = gds__attach_database(gds_status, 0, file_name, &DB, dpb_length, dpb);
GDS_REF(DB), dpb_length, dpb);
if (!DDL_replace) { if (!DDL_replace) {
if (!result) { if (!result) {
gds__detach_database(gds_status, GDS_REF(DB)); gds__detach_database(gds_status, &DB);
DDL_msg_put(18, file_name, NULL, NULL, NULL, NULL); /* msg 18: Database \"%s\" already exists */ DDL_msg_put(18, file_name, NULL, NULL, NULL, NULL);
/* msg 18: Database \"%s\" already exists */
if (DDL_interactive) { if (DDL_interactive) {
DDL_msg_partial(19, NULL, NULL, NULL, NULL, NULL); /* msg 19: Do you want to replace it? */ DDL_msg_partial(19, NULL, NULL, NULL, NULL, NULL);
/* msg 19: Do you want to replace it? */
if (!DDL_yes_no(286)) if (!DDL_yes_no(286))
DDL_exit(FINI_ERROR); DDL_exit(FINI_ERROR);
} }
@ -232,7 +233,8 @@ void EXE_create_database( DBB dbb)
DDL_exit(FINI_ERROR); DDL_exit(FINI_ERROR);
} }
else if (gds_status[1] != gds_io_error) else if (gds_status[1] != gds_io_error)
DDL_error_abort(gds_status, 20, file_name, NULL, NULL, NULL, NULL); /* msg 20: Database \"%s\" exists but can't be opened */ DDL_error_abort(gds_status, 20, file_name, NULL, NULL, NULL, NULL);
/* msg 20: Database \"%s\" exists but can't be opened */
} }
else { else {
/* replacing the database so try to drop it first. */ /* replacing the database so try to drop it first. */
@ -287,17 +289,13 @@ void EXE_create_database( DBB dbb)
if (dpb_length == 1) if (dpb_length == 1)
dpb_length = 0; dpb_length = 0;
if (gds__create_database(gds_status, if (gds__create_database(gds_status, 0, file_name, &DB, dpb_length, dpb, 0))
0, DDL_error_abort(gds_status, 21, file_name, NULL, NULL, NULL, NULL);
GDS_VAL(file_name), /* msg 21: Couldn't create database \"%s\" */
GDS_REF(DB),
dpb_length,
dpb,
0))
DDL_error_abort(gds_status, 21, file_name, NULL, NULL, NULL, NULL); /* msg 21: Couldn't create database \"%s\" */
if (DDL_version) { if (DDL_version) {
DDL_msg_put(23, file_name, NULL, NULL, NULL, NULL); /* msg 23: Version(s) for database \"%s\" */ DDL_msg_put(23, file_name, NULL, NULL, NULL, NULL);
/* msg 23: Version(s) for database \"%s\" */
gds__version(&DB, NULL, NULL); gds__version(&DB, NULL, NULL);
} }
@ -354,13 +352,10 @@ void EXE_create_database( DBB dbb)
if ((dbb->dbb_flags & DBB_log_default) || (dbb->dbb_logfiles)) { if ((dbb->dbb_flags & DBB_log_default) || (dbb->dbb_logfiles)) {
/* setup enough information to drop log files created */ /* setup enough information to drop log files created */
if (gds__database_info(gds_status, if (gds__database_info(gds_status, &DB, sizeof(db_info), db_info,
GDS_REF(DB), sizeof(db_info_buffer), db_info_buffer))
sizeof(db_info), DDL_error_abort(gds_status, 327, NULL, NULL, NULL, NULL, NULL);
db_info, /* msg 327: error in getting write ahead log information */
sizeof(db_info_buffer),
db_info_buffer))
DDL_error_abort(gds_status, 327, NULL, NULL, NULL, NULL, NULL); /* msg 327: error in getting write ahead log information */
log = 0; log = 0;
@ -419,13 +414,10 @@ void EXE_drop_database( DBB dbb)
if (dpb_length == 1) if (dpb_length == 1)
dpb_length = 0; dpb_length = 0;
if (gds__attach_database(gds_status, if (gds__attach_database(gds_status, 0, dbb->dbb_name->sym_string, &DB,
0, dpb_length, dpb))
GDS_VAL(dbb->dbb_name->sym_string), DDL_error_abort(gds_status, 25, NULL, NULL, NULL, NULL, NULL);
GDS_REF(DB), /* msg 25: Couldn't locate database */
dpb_length,
dpb))
DDL_error_abort(gds_status, 25, NULL, NULL, NULL, NULL, NULL); /* msg 25: Couldn't locate database */
START_TRANSACTION; START_TRANSACTION;
@ -433,25 +425,24 @@ void EXE_drop_database( DBB dbb)
alloc_file_name(&dbb->dbb_files, (UCHAR*) F.RDB$FILE_NAME); alloc_file_name(&dbb->dbb_files, (UCHAR*) F.RDB$FILE_NAME);
END_FOR; END_FOR;
COMMIT ON_ERROR DDL_db_error(gds_status, 26, NULL, NULL, NULL, NULL, NULL); /* msg 26: error commiting metadata changes */ COMMIT ON_ERROR DDL_db_error(gds_status, 26, NULL, NULL, NULL, NULL, NULL);
/* msg 26: error commiting metadata changes */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
if (gds__database_info(gds_status, if (gds__database_info(gds_status, &DB, sizeof(db_info), db_info,
GDS_REF(DB), sizeof(db_info_buffer), db_info_buffer))
sizeof(db_info), DDL_error_abort(gds_status, 327, NULL, NULL, NULL, NULL, NULL);
db_info, /* msg 327: error in getting write ahead log information */
sizeof(db_info_buffer),
db_info_buffer))
DDL_error_abort(gds_status, 327, NULL, NULL, NULL, NULL, NULL); /* msg 327: error in getting write ahead log information */
wal_info((UCHAR*) db_info_buffer, &log, cur_log, &part_offset); wal_info((UCHAR*) db_info_buffer, &log, cur_log, &part_offset);
if (log) if (log)
get_log_names_serial(&dbb->dbb_files); get_log_names_serial(&dbb->dbb_files);
if (gds__detach_database(gds_status, GDS_REF(DB))) if (gds__detach_database(gds_status, &DB))
DDL_error_abort(gds_status, 27, NULL, NULL, NULL, NULL, NULL); /* msg 27: Couldn't release database */ DDL_error_abort(gds_status, 27, NULL, NULL, NULL, NULL, NULL);
/* msg 27: Couldn't release database */
if (log) { if (log) {
get_log_names(dbb->dbb_name->sym_string, &dbb->dbb_files, cur_log, get_log_names(dbb->dbb_name->sym_string, &dbb->dbb_files, cur_log,
@ -641,7 +632,8 @@ void EXE_execute(void)
break; break;
default: default:
DDL_err(34, NULL, NULL, NULL, NULL, NULL); /* msg 34: action not implemented yet */ DDL_err(34, NULL, NULL, NULL, NULL, NULL);
/* msg 34: action not implemented yet */
} }
} }
} }
@ -671,11 +663,13 @@ void EXE_fini( DBB dbb)
} }
ROLLBACK ROLLBACK
ON_ERROR DDL_db_error(gds_status, 35, NULL, NULL, NULL, NULL, NULL); /* msg 35: error rolling back metadata changes */ ON_ERROR DDL_db_error(gds_status, 35, NULL, NULL, NULL, NULL, NULL);
/* msg 35: error rolling back metadata changes */
END_ERROR} END_ERROR}
else { else {
COMMIT COMMIT
ON_ERROR DDL_db_error(gds_status, 36, NULL, NULL, NULL, NULL, NULL); /* msg 36: error commiting metadata changes */ ON_ERROR DDL_db_error(gds_status, 36, NULL, NULL, NULL, NULL, NULL);
/* msg 36: error commiting metadata changes */
ROLLBACK; ROLLBACK;
END_ERROR} END_ERROR}
FINISH; FINISH;
@ -768,16 +762,14 @@ void EXE_modify_database( DBB dbb)
if (dpb_length == 1) if (dpb_length == 1)
dpb_length = 0; dpb_length = 0;
if (gds__attach_database(gds_status, 0, if (gds__attach_database(gds_status, 0, dbb->dbb_name->sym_string, &DB,
GDS_VAL(dbb->dbb_name->sym_string), dpb_length, dpb))
GDS_REF(DB),
dpb_length,
dpb))
DDL_error_abort(gds_status, 29, dbb->dbb_name->sym_string, NULL, DDL_error_abort(gds_status, 29, dbb->dbb_name->sym_string, NULL,
NULL, NULL, NULL); /* msg 29: Couldn't attach database */ NULL, NULL, NULL); /* msg 29: Couldn't attach database */
if (DDL_version) { if (DDL_version) {
DDL_msg_put(30, dbb->dbb_name->sym_string, NULL, NULL, NULL, NULL); /* msg 30: Version(s) for database \"%s\" */ DDL_msg_put(30, dbb->dbb_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 30: Version(s) for database \"%s\" */
gds__version(&DB, NULL, NULL); gds__version(&DB, NULL, NULL);
} }
@ -806,13 +798,10 @@ void EXE_modify_database( DBB dbb)
/* erase log files and commit transaction */ /* erase log files and commit transaction */
if (dbb->dbb_flags & DBB_drop_log) { if (dbb->dbb_flags & DBB_drop_log) {
if (gds__database_info(gds_status, if (gds__database_info(gds_status, &DB, sizeof(db_info), db_info,
GDS_REF(DB), sizeof(db_info_buffer), db_info_buffer))
sizeof(db_info), DDL_error_abort(gds_status, 327, NULL, NULL, NULL, NULL, NULL);
db_info, /* msg 327: error in getting write ahead log information */
sizeof(db_info_buffer),
db_info_buffer))
DDL_error_abort(gds_status, 327, NULL, NULL, NULL, NULL, NULL); /* msg 327: error in getting write ahead log information */
log_files = NULL; log_files = NULL;
log = 0; log = 0;
@ -824,7 +813,8 @@ void EXE_modify_database( DBB dbb)
FOR X IN RDB$LOG_FILES ERASE X; FOR X IN RDB$LOG_FILES ERASE X;
END_FOR; END_FOR;
COMMIT ON_ERROR DDL_db_error(gds_status, 321, NULL, NULL, NULL, NULL, NULL); /* msg 321: error commiting new write ahead log declarations */ COMMIT ON_ERROR DDL_db_error(gds_status, 321, NULL, NULL, NULL, NULL, NULL);
/* msg 321: error commiting new write ahead log declarations */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -866,7 +856,8 @@ void EXE_modify_database( DBB dbb)
/* commit log file changes */ /* commit log file changes */
COMMIT ON_ERROR DDL_db_error(gds_status, 321, NULL, NULL, NULL, NULL, NULL); /* msg 321: error commiting new write ahead log declarations */ COMMIT ON_ERROR DDL_db_error(gds_status, 321, NULL, NULL, NULL, NULL, NULL);
/* msg 321: error commiting new write ahead log declarations */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -950,7 +941,8 @@ static void add_cache( DBB dbb)
FOR FIL IN RDB$FILES WITH FIL.RDB$FILE_FLAGS EQ FILE_cache FOR FIL IN RDB$FILES WITH FIL.RDB$FILE_FLAGS EQ FILE_cache
result = TRUE; result = TRUE;
DDL_err(323, FIL.RDB$FILE_NAME, NULL, NULL, NULL, NULL); /* msg 323: a shared cache file %s already exists */ DDL_err(323, FIL.RDB$FILE_NAME, NULL, NULL, NULL, NULL);
/* msg 323: a shared cache file %s already exists */
END_FOR; END_FOR;
if (result) if (result)
@ -968,7 +960,8 @@ static void add_cache( DBB dbb)
/* Unless there are errors, commit the new shared cache immediately! */ /* Unless there are errors, commit the new shared cache immediately! */
if (!DDL_errors) { if (!DDL_errors) {
COMMIT ON_ERROR DDL_db_error(gds_status, 324, NULL, NULL, NULL, NULL, NULL); /* msg 324: error commiting new shared cache declaration */ COMMIT ON_ERROR DDL_db_error(gds_status, 324, NULL, NULL, NULL, NULL, NULL);
/* msg 324: error commiting new shared cache declaration */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -1076,13 +1069,10 @@ static void add_files( DBB dbb, FIL files)
against the user given maximum length (if given). */ against the user given maximum length (if given). */
if (dbb) { if (dbb) {
if (gds__database_info(gds_status, if (gds__database_info(gds_status, &DB, sizeof(alloc_info), alloc_info,
GDS_REF(DB), sizeof(s), s) || s[0] != gds_info_allocation)
sizeof(alloc_info), DDL_err(38, NULL, NULL, NULL, NULL, NULL);
alloc_info, /* msg 38: gds__database_info failed */
sizeof(s),
s) ||
s[0] != gds_info_allocation) DDL_err(38, NULL, NULL, NULL, NULL, NULL); /* msg 38: gds__database_info failed */
length = gds__vax_integer((UCHAR*) s + 1, 2); length = gds__vax_integer((UCHAR*) s + 1, 2);
start = gds__vax_integer((UCHAR*) s + 3, length); start = gds__vax_integer((UCHAR*) s + 3, length);
@ -1119,7 +1109,8 @@ static void add_files( DBB dbb, FIL files)
/* Unless there are errors floating around, commit the new file immediately! */ /* Unless there are errors floating around, commit the new file immediately! */
if (!DDL_errors) { if (!DDL_errors) {
COMMIT ON_ERROR DDL_db_error(gds_status, 40, NULL, NULL, NULL, NULL, NULL); /* msg 40: error commiting new file declarations */ COMMIT ON_ERROR DDL_db_error(gds_status, 40, NULL, NULL, NULL, NULL, NULL);
/* msg 40: error commiting new file declarations */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -1173,7 +1164,8 @@ static void add_function( FUNC function)
**************************************/ **************************************/
if (check_function(function->func_name)) { if (check_function(function->func_name)) {
DDL_err(41, function->func_name->sym_string, NULL, NULL, NULL, NULL); /* msg 41: function %s already exists */ DDL_err(41, function->func_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 41: function %s already exists */
return; return;
} }
@ -1375,7 +1367,8 @@ static void add_index( DUDLEY_IDX index)
FOR X IN RDB$RELATIONS WITH FOR X IN RDB$RELATIONS WITH
X.RDB$RELATION_NAME = index->idx_relation->sym_string X.RDB$RELATION_NAME = index->idx_relation->sym_string
if (!X.RDB$VIEW_BLR.NULL) { if (!X.RDB$VIEW_BLR.NULL) {
DDL_err(42, index->idx_relation->sym_string, NULL, NULL, NULL, NULL); /* msg 42: %s is a view and can not be indexed */ DDL_err(42, index->idx_relation->sym_string, NULL, NULL, NULL, NULL);
/* msg 42: %s is a view and can not be indexed */
error = TRUE; error = TRUE;
} }
if_any = TRUE; if_any = TRUE;
@ -1385,7 +1378,8 @@ static void add_index( DUDLEY_IDX index)
return; return;
if (!if_any) { if (!if_any) {
DDL_err(43, index->idx_relation->sym_string, NULL, NULL, NULL, NULL); /* msg 43: relation %s doesn't exist */ DDL_err(43, index->idx_relation->sym_string, NULL, NULL, NULL, NULL);
/* msg 43: relation %s doesn't exist */
return; return;
} }
@ -1441,7 +1435,8 @@ static void add_index( DUDLEY_IDX index)
else else
X.RDB$DESCRIPTION.NULL = TRUE; X.RDB$DESCRIPTION.NULL = TRUE;
END_STORE ON_ERROR if (gds_status[1] == gds_no_dup) { END_STORE ON_ERROR if (gds_status[1] == gds_no_dup) {
DDL_err(47, index->idx_name->sym_string, NULL, NULL, NULL, NULL); /* msg 47: index %s already exists */ DDL_err(47, index->idx_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 47: index %s already exists */
return; return;
} }
@ -1532,7 +1527,8 @@ static void add_log_files( DBB dbb)
/* Unless there were errors , commit immediately! */ /* Unless there were errors , commit immediately! */
if (!DDL_errors) { if (!DDL_errors) {
COMMIT ON_ERROR DDL_db_error(gds_status, 321, NULL, NULL, NULL, NULL, NULL); /* msg 321: error commiting new write ahead log declarations */ COMMIT ON_ERROR DDL_db_error(gds_status, 321, NULL, NULL, NULL, NULL, NULL);
/* msg 321: error commiting new write ahead log declarations */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -1559,7 +1555,8 @@ static void add_relation( DUDLEY_REL relation)
} }
if (check_relation(relation->rel_name)) { if (check_relation(relation->rel_name)) {
DDL_err(49, relation->rel_name->sym_string, NULL, NULL, NULL, NULL); /* msg 49: relation %s already exists */ DDL_err(49, relation->rel_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 49: relation %s already exists */
return; return;
} }
@ -1609,7 +1606,8 @@ static void add_security_class( SCL sec_class)
FOR X IN RDB$SECURITY_CLASSES WITH X.RDB$SECURITY_CLASS EQ name->sym_string FOR X IN RDB$SECURITY_CLASSES WITH X.RDB$SECURITY_CLASS EQ name->sym_string
if_any = TRUE; if_any = TRUE;
DDL_err(50, name->sym_string, NULL, NULL, NULL, NULL); /* msg 50: security class %s already exists */ DDL_err(50, name->sym_string, NULL, NULL, NULL, NULL);
/* msg 50: security class %s already exists */
END_FOR; END_FOR;
if (if_any) if (if_any)
@ -1831,7 +1829,8 @@ static void add_view( DUDLEY_REL relation)
USHORT i; USHORT i;
if (check_relation(relation->rel_name)) { if (check_relation(relation->rel_name)) {
DDL_err(55, relation->rel_name->sym_string, NULL, NULL, NULL, NULL); /* msg 55: relation %s already exists */ DDL_err(55, relation->rel_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 55: relation %s already exists */
return; return;
} }
@ -2130,8 +2129,9 @@ static void close_blob(FRBRD *blob)
**************************************/ **************************************/
ISC_STATUS_ARRAY status_vector; ISC_STATUS_ARRAY status_vector;
if (gds__close_blob(status_vector, GDS_REF(blob))) if (gds__close_blob(status_vector, &blob))
DDL_db_error(status_vector, 58, NULL, NULL, NULL, NULL, NULL); /* msg 58: gds__close_blob failed */ DDL_db_error(status_vector, 58, NULL, NULL, NULL, NULL, NULL);
/* msg 58: gds__close_blob failed */
} }
@ -2152,11 +2152,10 @@ static FRBRD *create_blob( SLONG * blob_id, USHORT bpb_length, UCHAR * bpb)
blob = NULL; blob = NULL;
if (gds__create_blob2(status_vector, if (gds__create_blob2(status_vector, &DB, &gds_trans, &blob,
GDS_REF(DB), (GDS__QUAD*) blob_id, bpb_length, (SCHAR*) bpb)) {
GDS_REF(gds_trans), DDL_db_error(status_vector, 59, NULL, NULL, NULL, NULL, NULL);
GDS_REF(blob), (GDS__QUAD*) GDS_VAL(blob_id), bpb_length, (SCHAR*) bpb)) { /* msg 59: gds__create_blob failed */
DDL_db_error(status_vector, 59, NULL, NULL, NULL, NULL, NULL); /* msg 59: gds__create_blob failed */
return NULL; return NULL;
} }
@ -2186,12 +2185,14 @@ static void drop_cache( DBB dbb)
END_FOR; END_FOR;
if (!found) if (!found)
DDL_err(325, NULL, NULL, NULL, NULL, NULL); /* msg 325: no shared cache file exists to drop */ DDL_err(325, NULL, NULL, NULL, NULL, NULL);
/* msg 325: no shared cache file exists to drop */
if (!DDL_errors) { if (!DDL_errors) {
COMMIT COMMIT
ON_ERROR ON_ERROR
DDL_db_error(gds_status, 326, NULL, NULL, NULL, NULL, NULL); /* msg 326: error commiting deletion of shared cache file */ DDL_db_error(gds_status, 326, NULL, NULL, NULL, NULL, NULL);
/* msg 326: error commiting deletion of shared cache file */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -2292,7 +2293,8 @@ static void drop_filter( FILTER filter)
END_FOR; END_FOR;
if (!if_any) if (!if_any)
DDL_err(62, filter->filter_name->sym_string, NULL, NULL, NULL, NULL); /* msg 62: filter %s doesn't exist */ DDL_err(62, filter->filter_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 62: filter %s doesn't exist */
} }
@ -2326,7 +2328,8 @@ static void drop_function( FUNC function)
END_FOR; END_FOR;
if (!if_any) if (!if_any)
DDL_err(63, name, NULL, NULL, NULL, NULL); /* msg 63: function %s doesn't exist */ DDL_err(63, name, NULL, NULL, NULL, NULL);
/* msg 63: function %s doesn't exist */
} }
@ -2384,7 +2387,8 @@ static void drop_global_field( DUDLEY_FLD field)
ERASE X; ERASE X;
if_any = TRUE; if_any = TRUE;
END_FOR if (!if_any) END_FOR if (!if_any)
DDL_err(65, field->fld_name->sym_string, NULL, NULL, NULL, NULL); /* msg 65: field %s doesn't exist */ DDL_err(65, field->fld_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 65: field %s doesn't exist */
} }
@ -2418,7 +2422,8 @@ static void drop_index( DUDLEY_IDX index)
END_FOR; END_FOR;
if (!if_any) if (!if_any)
DDL_err(66, name, NULL, NULL, NULL, NULL); /* msg 66: index %s doesn't exist */ DDL_err(66, name, NULL, NULL, NULL, NULL);
/* msg 66: index %s doesn't exist */
} }
@ -2441,7 +2446,8 @@ static void drop_relation( DUDLEY_REL relation)
if_any = FALSE; if_any = FALSE;
FOR X IN RDB$VIEW_RELATIONS WITH X.RDB$RELATION_NAME EQ name FOR X IN RDB$VIEW_RELATIONS WITH X.RDB$RELATION_NAME EQ name
DDL_err(67, name, X.RDB$VIEW_NAME, NULL, NULL, NULL); /* msg 67: %s referenced by view %s */ DDL_err(67, name, X.RDB$VIEW_NAME, NULL, NULL, NULL);
/* msg 67: %s referenced by view %s */
return; return;
END_FOR; END_FOR;
@ -2449,14 +2455,16 @@ static void drop_relation( DUDLEY_REL relation)
FOR X IN RDB$RELATIONS WITH X.RDB$RELATION_NAME EQ name FOR X IN RDB$RELATIONS WITH X.RDB$RELATION_NAME EQ name
if (X.RDB$SYSTEM_FLAG == 1) { if (X.RDB$SYSTEM_FLAG == 1) {
DDL_err(68, name, NULL, NULL, NULL, NULL); /* msg 68: can't drop system relation %s */ DDL_err(68, name, NULL, NULL, NULL, NULL);
/* msg 68: can't drop system relation %s */
return; return;
} }
if_any = TRUE; if_any = TRUE;
END_FOR; END_FOR;
if (!if_any) { if (!if_any) {
DDL_err(69, name, NULL, NULL, NULL, NULL); /* msg 69: relation %s doesn't exist */ DDL_err(69, name, NULL, NULL, NULL, NULL);
/* msg 69: relation %s doesn't exist */
return; return;
} }
@ -2519,7 +2527,8 @@ static void drop_security_class( SCL scl_class)
END_FOR; END_FOR;
if (!if_any) if (!if_any)
DDL_err(70, name->sym_string, NULL, NULL, NULL, NULL); /* msg 70: security class %s doesn't exist */ DDL_err(70, name->sym_string, NULL, NULL, NULL, NULL);
/* msg 70: security class %s doesn't exist */
} }
@ -2552,12 +2561,14 @@ static void drop_shadow( SLONG shadow_number)
END_FOR; END_FOR;
if (!files) if (!files)
DDL_err(71, (TEXT *) shadow_number, NULL, NULL, NULL, NULL); /* msg 71: shadow %ld doesn't exist */ DDL_err(71, (TEXT *) shadow_number, NULL, NULL, NULL, NULL);
/* msg 71: shadow %ld doesn't exist */
if (!DDL_errors) { if (!DDL_errors) {
COMMIT COMMIT
ON_ERROR ON_ERROR
DDL_db_error(gds_status, 72, NULL, NULL, NULL, NULL, NULL); /* msg 72: error commiting deletion of shadow */ DDL_db_error(gds_status, 72, NULL, NULL, NULL, NULL, NULL);
/* msg 72: error commiting deletion of shadow */
ROLLBACK; ROLLBACK;
END_ERROR; END_ERROR;
START_TRANSACTION; START_TRANSACTION;
@ -2947,15 +2958,14 @@ static void get_log_names(SCHAR * db_name,
part_offset = next_offset; part_offset = next_offset;
while (log_count) { while (log_count) {
ret_val = WALF_get_next_log_info(gds_status, ret_val = WALF_get_next_log_info(gds_status, expanded_name, cl,
expanded_name, part_offset, nl, &next_offset,
cl, part_offset,
nl, &next_offset,
&log_seqno, &log_length, &log_seqno, &log_length,
&last_log_flag, 1); &last_log_flag, 1);
if (ret_val == FB_FAILURE) if (ret_val == FB_FAILURE)
DDL_error_abort(gds_status, 328, NULL, NULL, NULL, NULL, NULL); /* msg 328: error in reading list of log files */ DDL_error_abort(gds_status, 328, NULL, NULL, NULL, NULL, NULL);
/* msg 328: error in reading list of log files */
if (ret_val < 0) if (ret_val < 0)
break; break;
@ -3263,7 +3273,8 @@ static void make_desc( DUDLEY_NOD node, DSC * desc)
case dtype_timestamp: case dtype_timestamp:
case dtype_sql_date: case dtype_sql_date:
case dtype_sql_time: case dtype_sql_time:
DDL_msg_put(80, NULL, NULL, NULL, NULL, NULL); /* msg 80: TOTAL of date not supported */ DDL_msg_put(80, NULL, NULL, NULL, NULL, NULL);
/* msg 80: TOTAL of date not supported */
return; return;
default: default:
@ -3461,10 +3472,12 @@ static void make_desc( DUDLEY_NOD node, DSC * desc)
return; return;
case nod_fid: case nod_fid:
DDL_err(287, NULL, NULL, NULL, NULL, NULL); /* msg 287: Inappropriate self reference */ DDL_err(287, NULL, NULL, NULL, NULL, NULL);
/* msg 287: Inappropriate self reference */
return; return;
default: default:
DDL_err(81, NULL, NULL, NULL, NULL, NULL); /* msg 81: (EXE) make_desc: don't understand node type */ DDL_err(81, NULL, NULL, NULL, NULL, NULL);
/* msg 81: (EXE) make_desc: don't understand node type */
return; return;
} }
} }
@ -3592,7 +3605,8 @@ static void modify_field( DUDLEY_FLD field)
if_any = TRUE; if_any = TRUE;
END_FOR END_FOR
if (!if_any) if (!if_any)
DDL_err(82, name->sym_string, NULL, NULL, NULL, NULL); /* msg 82: field %s doesn't exist */ DDL_err(82, name->sym_string, NULL, NULL, NULL, NULL);
/* msg 82: field %s doesn't exist */
} }
@ -3692,7 +3706,8 @@ static void modify_global_field( DUDLEY_FLD field)
END_FOR END_FOR
if (!if_any) if (!if_any)
DDL_err(84, name->sym_string, NULL, NULL, NULL, NULL); /* msg 84: field %s doesn't exist */ DDL_err(84, name->sym_string, NULL, NULL, NULL, NULL);
/* msg 84: field %s doesn't exist */
} }
@ -3737,7 +3752,8 @@ static void modify_index( DUDLEY_IDX index)
END_FOR; END_FOR;
if (!if_any) if (!if_any)
DDL_err(85, index->idx_name->sym_string, NULL, NULL, NULL, NULL); /* msg 85: index %s does not exist */ DDL_err(85, index->idx_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 85: index %s does not exist */
} }
@ -3782,7 +3798,8 @@ static void modify_relation( DUDLEY_REL relation)
X.RDB$SYSTEM_FLAG = relation->rel_system; X.RDB$SYSTEM_FLAG = relation->rel_system;
if (relation->rel_filename) { if (relation->rel_filename) {
if (X.RDB$EXTERNAL_FILE.NULL) if (X.RDB$EXTERNAL_FILE.NULL)
DDL_err(86, name->sym_string, NULL, NULL, NULL, NULL); /* msg 86: relation %s is not external */ DDL_err(86, name->sym_string, NULL, NULL, NULL, NULL);
/* msg 86: relation %s is not external */
MOVE_SYMBOL(relation->rel_filename, X.RDB$EXTERNAL_FILE); MOVE_SYMBOL(relation->rel_filename, X.RDB$EXTERNAL_FILE);
} }
END_MODIFY END_MODIFY
@ -3790,7 +3807,8 @@ static void modify_relation( DUDLEY_REL relation)
END_FOR END_FOR
if (!if_any) if (!if_any)
DDL_err(87, name->sym_string, NULL, NULL, NULL, NULL); /* msg 87: relation %s doesn't exist */ DDL_err(87, name->sym_string, NULL, NULL, NULL, NULL);
/* msg 87: relation %s doesn't exist */
} }
@ -3850,7 +3868,8 @@ static void modify_trigger( DUDLEY_TRG trigger)
END_FOR; END_FOR;
if (!if_any) if (!if_any)
DDL_err(89, trigger->trg_name->sym_string, NULL, NULL, NULL, NULL); /* msg 89: Trigger %s doesn't exist */ DDL_err(89, trigger->trg_name->sym_string, NULL, NULL, NULL, NULL);
/* msg 89: Trigger %s doesn't exist */
} }
@ -3981,7 +4000,8 @@ static void set_generator( DUDLEY_NOD node)
prot_mask = get_prot_mask("RDB$GENERATORS", NULL); prot_mask = get_prot_mask("RDB$GENERATORS", NULL);
if (!(prot_mask & SCL_write)) { if (!(prot_mask & SCL_write)) {
DDL_err(311, NULL, NULL, NULL, NULL, NULL); /* msg 311: Set generator requires write privilege for RDB$GENERATORS. */ DDL_err(311, NULL, NULL, NULL, NULL, NULL);
/* msg 311: Set generator requires write privilege for RDB$GENERATORS. */
return; return;
} }
@ -4032,8 +4052,7 @@ static void set_generator( DUDLEY_NOD node)
blr = (SCHAR *) new_blr.str_start; blr = (SCHAR *) new_blr.str_start;
isc_compile_request2((SLONG *) 0, &DB, &req_handle2, l, blr); isc_compile_request2((SLONG *) 0, &DB, &req_handle2, l, blr);
isc_start_request((SLONG *) 0, &req_handle2, &gds_trans, 0); isc_start_request((SLONG *) 0, &req_handle2, &gds_trans, 0);
isc_receive((SLONG *) 0, &req_handle2, 0, sizeof(gen_value), &gen_value, isc_receive((SLONG *) 0, &req_handle2, 0, sizeof(gen_value), &gen_value, 0);
0);
isc_release_request((SLONG *) 0, &req_handle2); isc_release_request((SLONG *) 0, &req_handle2);
for (i = 5; (gen_value != new_val) && --i;) { for (i = 5; (gen_value != new_val) && --i;) {
@ -4080,8 +4099,9 @@ static void store_acl( SCL scl_class, SLONG * blob_id)
blob = create_blob(blob_id, 0, NULL); blob = create_blob(blob_id, 0, NULL);
if (gds__put_segment(status_vector, GDS_REF(blob), length, buffer)) { if (gds__put_segment(status_vector, &blob, length, buffer)) {
DDL_db_error(status_vector, 92, NULL, NULL, NULL, NULL, NULL); /* msg 92: gds__put_segment failed */ DDL_db_error(status_vector, 92, NULL, NULL, NULL, NULL, NULL);
/* msg 92: gds__put_segment failed */
return; return;
} }
@ -4122,9 +4142,9 @@ static void store_blr( DUDLEY_NOD node, SLONG * blob_id, DUDLEY_REL relation)
handle = create_blob(blob_id, 0, NULL); handle = create_blob(blob_id, 0, NULL);
length = blr.str_current - blr.str_start; length = blr.str_current - blr.str_start;
if (gds__put_segment(status_vector, if (gds__put_segment(status_vector, &handle, length, blr.str_start)) {
GDS_REF(handle), length, GDS_VAL(blr.str_start))) { DDL_db_error(status_vector, 93, NULL, NULL, NULL, NULL, NULL);
DDL_db_error(status_vector, 93, NULL, NULL, NULL, NULL, NULL); /* msg 93: gds__put_segment failed */ /* msg 93: gds__put_segment failed */
return; return;
} }
@ -4157,11 +4177,10 @@ static void store_query_header( DUDLEY_NOD node, SLONG * blob_id)
for (ptr = node->nod_arg, end = ptr + node->nod_count; ptr < end; ptr++) { for (ptr = node->nod_arg, end = ptr + node->nod_count; ptr < end; ptr++) {
symbol = (SYM) * ptr; symbol = (SYM) * ptr;
if (gds__put_segment(status_vector, if (gds__put_segment(status_vector, &blob, symbol->sym_length,
GDS_REF(blob), symbol->sym_string)) {
symbol->sym_length, DDL_db_error(status_vector, 93, NULL, NULL, NULL, NULL, NULL);
GDS_VAL(symbol->sym_string))) { /* msg 93: gds__put_segment failed */
DDL_db_error(status_vector, 93, NULL, NULL, NULL, NULL, NULL); /* msg 93: gds__put_segment failed */
return; return;
} }
} }
@ -4292,13 +4311,15 @@ static int string_length( SCHAR dtype)
case dtype_double: case dtype_double:
return 19; return 19;
case dtype_timestamp: case dtype_timestamp:
return 10; /* really 24, kept at 10 for old apps */ return 10;
/* really 24, kept at 10 for old apps */
case dtype_sql_date: case dtype_sql_date:
case dtype_sql_time: case dtype_sql_time:
case dtype_int64: case dtype_int64:
case dtype_blob: case dtype_blob:
default: default:
DDL_msg_put(94, NULL, NULL, NULL, NULL, NULL); /* msg 94: (EXE) string_length: No defined length for blobs */ DDL_msg_put(94, NULL, NULL, NULL, NULL, NULL);
/* msg 94: (EXE) string_length: No defined length for blobs */
return 0; return 0;
} }
} }

32
src/dudley/extract.epp
View File

@ -518,11 +518,10 @@ static void extract_database(TEXT * DB_file_name)
} }
END_FOR; END_FOR;
if (gds__database_info(status_vector, if (gds__database_info(status_vector, &DB, sizeof(db_items),
GDS_REF(DB),
sizeof(db_items),
db_items, sizeof(buffer), buffer)) { db_items, sizeof(buffer), buffer)) {
put_error(254, 0); /* msg 254: ***gds__database_info failed*** */ put_error(254, 0);
/* msg 254: ***gds__database_info failed*** */
gds__print_status(status_vector); gds__print_status(status_vector);
} }
@ -605,10 +604,7 @@ static void extract_database(TEXT * DB_file_name)
F.RDB$FILE_PARTITIONS); F.RDB$FILE_PARTITIONS);
END_FOR; END_FOR;
if (gds__database_info(gds_status, if (gds__database_info(gds_status, &DB, sizeof(db_info), db_info,
GDS_REF(DB),
sizeof(db_info),
db_info,
sizeof(db_info_buffer), db_info_buffer)) { sizeof(db_info_buffer), db_info_buffer)) {
put_error(254, 0); /* msg 254: ***gds__database_info failed*** */ put_error(254, 0); /* msg 254: ***gds__database_info failed*** */
gds__print_status(status_vector); gds__print_status(status_vector);
@ -1766,7 +1762,7 @@ static int name_trunc(TEXT * in, TEXT * out)
TEXT *start; TEXT *start;
if (!in || *in == ' ') if (!in || *in == ' ')
return 0; //return NULL return 0; //return NULL;
start = out; start = out;
@ -1809,13 +1805,11 @@ static void print_blob(SLONG * blob_id, TEXT type)
blob = NULL; blob = NULL;
bpb = r = bpb_buffer; bpb = r = bpb_buffer;
if (gds__open_blob2(status_vector, if (gds__open_blob2(status_vector, &DB, &gds_trans, &blob,
GDS_REF(DB), (GDS__QUAD*) blob_id, (USHORT) (r - bpb), (SCHAR*) bpb)) {
GDS_REF(gds_trans),
GDS_REF(blob),
(GDS__QUAD*) GDS_VAL(blob_id), (USHORT) (r - bpb), (SCHAR*) bpb)) {
gds__print_status(status_vector); gds__print_status(status_vector);
DDL_err(269, NULL, NULL, NULL, NULL, NULL); /* msg 269: gds__open_blob failed */ DDL_err(269, NULL, NULL, NULL, NULL, NULL);
/* msg 269: gds__open_blob failed */
return; return;
} }
@ -1825,9 +1819,7 @@ static void print_blob(SLONG * blob_id, TEXT type)
*blr_buffer = 0; *blr_buffer = 0;
} }
while (!(status = gds__get_segment(status_vector, while (!(status = gds__get_segment(status_vector, &blob, (USHORT*) &length,
GDS_REF(blob),
(USHORT*) GDS_REF(length),
(USHORT) (sizeof(buffer) - 1), (USHORT) (sizeof(buffer) - 1),
buffer)) || status == gds_segment) { buffer)) || status == gds_segment) {
buffer[length] = 0; buffer[length] = 0;
@ -1873,7 +1865,7 @@ static void print_blob(SLONG * blob_id, TEXT type)
return; return;
} }
if (gds__close_blob(status_vector, GDS_REF(blob))) { if (gds__close_blob(status_vector, &blob)) {
gds__print_status(status_vector); gds__print_status(status_vector);
DDL_err(272, NULL, NULL, NULL, NULL, NULL); /* msg 272: gds__close_blob failed */ DDL_err(272, NULL, NULL, NULL, NULL, NULL); /* msg 272: gds__close_blob failed */
return; return;
@ -1963,7 +1955,7 @@ static void set_capabilities(void)
END_FOR; END_FOR;
} }
gds__release_request(gds_status, GDS_REF(req)); gds__release_request(gds_status, &req);
} }

20
src/dudley/lex.cpp
View File

@ -212,7 +212,8 @@ void LEX_get_text( SCHAR * buffer, TXT text)
if (ib_fseek(trace_file, start, 0)) { if (ib_fseek(trace_file, start, 0)) {
ib_fseek(trace_file, (SLONG) 0, 2); ib_fseek(trace_file, (SLONG) 0, 2);
DDL_err(275, NULL, NULL, NULL, NULL, NULL); /* msg 275: ib_fseek failed */ DDL_err(275, NULL, NULL, NULL, NULL, NULL);
/* msg 275: ib_fseek failed */
} }
p = buffer; p = buffer;
@ -243,7 +244,8 @@ void LEX_init( void *file)
trace_file = (IB_FILE *) gds__temp_file(TRUE, SCRATCH, trace_file_name); trace_file = (IB_FILE *) gds__temp_file(TRUE, SCRATCH, trace_file_name);
#endif #endif
if (trace_file == (IB_FILE *) - 1) if (trace_file == (IB_FILE *) - 1)
DDL_err(276, NULL, NULL, NULL, NULL, NULL); /* msg 276: couldn't open scratch file */ DDL_err(276, NULL, NULL, NULL, NULL, NULL);
/* msg 276: couldn't open scratch file */
input_file = (IB_FILE *) file; input_file = (IB_FILE *) file;
DDL_char = DDL_buffer; DDL_char = DDL_buffer;
@ -276,7 +278,8 @@ void LEX_put_text (FRBRD *blob, TXT text)
if (ib_fseek(trace_file, start, 0)) { if (ib_fseek(trace_file, start, 0)) {
ib_fseek(trace_file, (SLONG) 0, 2); ib_fseek(trace_file, (SLONG) 0, 2);
DDL_err(275, NULL, NULL, NULL, NULL, NULL); /* msg 275: ib_fseek failed */ DDL_err(275, NULL, NULL, NULL, NULL, NULL);
/* msg 275: ib_fseek failed */
} }
while (length) { while (length) {
@ -288,8 +291,9 @@ void LEX_put_text (FRBRD *blob, TXT text)
break; break;
} }
if (l = p - buffer) if (l = p - buffer)
if (gds__put_segment(status_vector, GDS_REF(blob), l, buffer)) if (gds__put_segment(status_vector, &blob, l, buffer))
DDL_err(277, NULL, NULL, NULL, NULL, NULL); /* msg 277: gds__put_segment failed */ DDL_err(277, NULL, NULL, NULL, NULL, NULL);
/* msg 277: gds__put_segment failed */
} }
ib_fseek(trace_file, (SLONG) 0, 2); ib_fseek(trace_file, (SLONG) 0, 2);
@ -377,7 +381,8 @@ TOK LEX_token(void)
token->tok_type = tok_quoted; token->tok_type = tok_quoted;
do { do {
if (!(next = nextchar()) || next == '\n') { if (!(next = nextchar()) || next == '\n') {
DDL_err(278, NULL, NULL, NULL, NULL, NULL); /* msg 278: unterminated quoted string */ DDL_err(278, NULL, NULL, NULL, NULL, NULL);
/* msg 278: unterminated quoted string */
break; break;
} }
*p++ = next; *p++ = next;
@ -448,7 +453,8 @@ static int nextchar(void)
if (DDL_char < end) if (DDL_char < end)
*DDL_char++ = c; *DDL_char++ = c;
else else
DDL_err(279, NULL, NULL, NULL, NULL, NULL); /* msg 279: line too SLONG */ DDL_err(279, NULL, NULL, NULL, NULL, NULL);
/* msg 279: line too SLONG */
if (c == '\n') if (c == '\n')
break; break;
} }