diff --git a/lang_helpers/gds_codes.pas b/lang_helpers/gds_codes.pas index ce645db953..0a0f850e96 100644 --- a/lang_helpers/gds_codes.pas +++ b/lang_helpers/gds_codes.pas @@ -1957,8 +1957,8 @@ const gds_tom_key_length = 335545274; isc_inf_invalid_args = 335545275; gds_inf_invalid_args = 335545275; - isc_tom_bad_param = 335545276; - gds_tom_bad_param = 335545276; + isc_sysf_invalid_null_empty = 335545276; + gds_sysf_invalid_null_empty = 335545276; isc_gfix_db_name = 335740929; gds_gfix_db_name = 335740929; isc_gfix_invalid_sw = 335740930; diff --git a/src/include/gen/Firebird.pas b/src/include/gen/Firebird.pas index 9c0a257c8e..f98fbb9295 100644 --- a/src/include/gen/Firebird.pas +++ b/src/include/gen/Firebird.pas @@ -5134,7 +5134,7 @@ const isc_block_size = 335545273; isc_tom_key_length = 335545274; isc_inf_invalid_args = 335545275; - isc_tom_bad_param = 335545276; + isc_sysf_invalid_null_empty = 335545276; isc_gfix_db_name = 335740929; isc_gfix_invalid_sw = 335740930; isc_gfix_incmp_sw = 335740932; diff --git a/src/include/gen/codetext.h b/src/include/gen/codetext.h index 13fe16840f..e122c9399e 100644 --- a/src/include/gen/codetext.h +++ b/src/include/gen/codetext.h @@ -977,7 +977,7 @@ static const struct { {"block_size", 335545273}, {"tom_key_length", 335545274}, {"inf_invalid_args", 335545275}, - {"tom_bad_param", 335545276}, + {"sysf_invalid_null_empty", 335545276}, {"gfix_db_name", 335740929}, {"gfix_invalid_sw", 335740930}, {"gfix_incmp_sw", 335740932}, diff --git a/src/include/gen/iberror.h b/src/include/gen/iberror.h index b69be6731d..dea0e45fc7 100644 --- a/src/include/gen/iberror.h +++ b/src/include/gen/iberror.h @@ -1011,7 +1011,7 @@ const ISC_STATUS isc_ses_reset_failed = 335545272L; const ISC_STATUS isc_block_size = 335545273L; const ISC_STATUS isc_tom_key_length = 335545274L; const ISC_STATUS isc_inf_invalid_args = 335545275L; -const ISC_STATUS isc_tom_bad_param = 335545276L; +const ISC_STATUS isc_sysf_invalid_null_empty = 335545276L; const ISC_STATUS isc_gfix_db_name = 335740929L; const ISC_STATUS isc_gfix_invalid_sw = 335740930L; const ISC_STATUS isc_gfix_incmp_sw = 335740932L; @@ -2485,7 +2485,7 @@ const ISC_STATUS isc_err_max = 1448; #define isc_block_size 335545273L #define isc_tom_key_length 335545274L #define isc_inf_invalid_args 335545275L -#define isc_tom_bad_param 335545276L +#define isc_sysf_invalid_null_empty 335545276L #define isc_gfix_db_name 335740929L #define isc_gfix_invalid_sw 335740930L #define isc_gfix_incmp_sw 335740932L diff --git a/src/include/gen/msgs.h b/src/include/gen/msgs.h index e1d0096ef7..77d85f4b3d 100644 --- a/src/include/gen/msgs.h +++ b/src/include/gen/msgs.h @@ -980,7 +980,7 @@ Data source : @4"}, /* eds_statement */ {335545273, "File size is less than expected"}, /* block_size */ {335545274, "Invalid key length @1, need >@2"}, /* tom_key_length */ {335545275, "Invalid information arguments"}, /* inf_invalid_args */ - {335545276, "Empty or NULL parameter @1 is not accepted"}, /* tom_bad_param */ + {335545276, "Empty or NULL parameter @1 is not accepted"}, /* sysf_invalid_null_empty */ {335740929, "data base file name (@1) already given"}, /* gfix_db_name */ {335740930, "invalid switch @1"}, /* gfix_invalid_sw */ {335740932, "incompatible switch combination"}, /* gfix_incmp_sw */ diff --git a/src/include/gen/sql_code.h b/src/include/gen/sql_code.h index c7b91835b6..50cf84e837 100644 --- a/src/include/gen/sql_code.h +++ b/src/include/gen/sql_code.h @@ -976,7 +976,7 @@ static const struct { {335545273, -902}, /* 953 block_size */ {335545274, -901}, /* 954 tom_key_length */ {335545275, -901}, /* 955 inf_invalid_args */ - {335545276, -901}, /* 956 tom_bad_param */ + {335545276, -901}, /* 956 sysf_invalid_null_empty */ {335740929, -901}, /* 1 gfix_db_name */ {335740930, -901}, /* 2 gfix_invalid_sw */ {335740932, -901}, /* 4 gfix_incmp_sw */ diff --git a/src/include/gen/sql_state.h b/src/include/gen/sql_state.h index aea7f99d3b..35152cda10 100644 --- a/src/include/gen/sql_state.h +++ b/src/include/gen/sql_state.h @@ -976,7 +976,7 @@ static const struct { {335545273, "XX000"}, // 953 block_size {335545274, "22023"}, // 954 tom_key_length {335545275, "HY000"}, // 955 inf_invalid_args - {335545276, "22023"}, // 956 tom_bad_param + {335545276, "22023"}, // 956 sysf_invalid_null_empty {335740929, "00000"}, // 1 gfix_db_name {335740930, "00000"}, // 2 gfix_invalid_sw {335740932, "00000"}, // 4 gfix_incmp_sw diff --git a/src/jrd/SysFunction.cpp b/src/jrd/SysFunction.cpp index b78a515566..1d93adb993 100644 --- a/src/jrd/SysFunction.cpp +++ b/src/jrd/SysFunction.cpp @@ -2918,7 +2918,7 @@ public: if (l == 0) { if (objectName) - (Arg::Gds(isc_tom_bad_param) << objectName).raise(); + (Arg::Gds(isc_sysf_invalid_null_empty) << objectName).raise(); v = nullptr; } diff --git a/src/msgs/messages2.sql b/src/msgs/messages2.sql index b422e8f5a1..3ed42bab2c 100644 --- a/src/msgs/messages2.sql +++ b/src/msgs/messages2.sql @@ -1063,7 +1063,7 @@ Data source : @4', NULL, NULL) ('block_size', NULL, 'unix.cpp', NULL, 0, 953, NULL, 'File size is less than expected', NULL, NULL); ('tom_key_length', NULL, 'SysFunction.cpp', NULL, 0, 954, NULL, 'Invalid key length @1, need >@2', NULL, NULL); ('inf_invalid_args', NULL, NULL, NULL, 0, 955, NULL, 'Invalid information arguments', NULL, NULL); -('tom_bad_param', NULL, 'SysFunction.cpp', NULL, 0, 956, NULL, 'Empty or NULL parameter @1 is not accepted', NULL, NULL); +('sysf_invalid_null_empty', NULL, 'SysFunction.cpp', NULL, 0, 956, NULL, 'Empty or NULL parameter @1 is not accepted', NULL, NULL); -- GFIX ('gfix_db_name', 'ALICE_gfix', 'alice.c', NULL, 3, 1, NULL, 'data base file name (@1) already given', NULL, NULL); ('gfix_invalid_sw', 'ALICE_gfix', 'alice.c', NULL, 3, 2, NULL, 'invalid switch @1', NULL, NULL); diff --git a/src/msgs/system_errors2.sql b/src/msgs/system_errors2.sql index 8d76746ad8..502d7759b9 100644 --- a/src/msgs/system_errors2.sql +++ b/src/msgs/system_errors2.sql @@ -962,7 +962,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA (-902, 'XX', '000', 0, 953, 'block_size', NULL, NULL) (-901, '22', '023', 0, 954, 'tom_key_length', NULL, NULL) (-901, 'HY', '000', 0, 955, 'inf_invalid_args', NULL, 'WARNING') -(-901, '22', '023', 0, 956, 'tom_bad_param', NULL, NULL) +(-901, '22', '023', 0, 956, 'sysf_invalid_null_empty', NULL, NULL) -- GFIX (-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL) (-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)