Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[54045] firebird/trunk
|
From: <asf...@us...> - 2012-02-25 13:55:10
|
Revision: 54045
http://firebird.svn.sourceforge.net/firebird/?rev=54045&view=rev
Author: asfernandes
Date: 2012-02-25 13:55:04 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Renamed error constant/message by Alex request.
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2012-02-25 13:55:04 UTC (rev 54045)
@@ -1390,8 +1390,8 @@
PARAMETER (GDS__package_name = 335544988)
INTEGER*4 GDS__cannot_make_not_null
PARAMETER (GDS__cannot_make_not_null = 335544989)
- INTEGER*4 GDS__feature_deprecated
- PARAMETER (GDS__feature_deprecated = 335544990)
+ INTEGER*4 GDS__feature_removed
+ PARAMETER (GDS__feature_removed = 335544990)
INTEGER*4 GDS__view_name
PARAMETER (GDS__view_name = 335544991)
INTEGER*4 GDS__lock_dir_access
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2012-02-25 13:55:04 UTC (rev 54045)
@@ -702,7 +702,7 @@
gds_no_trusted_spb = 335544987;
gds_package_name = 335544988;
gds_cannot_make_not_null = 335544989;
- gds_feature_deprecated = 335544990;
+ gds_feature_removed = 335544990;
gds_view_name = 335544991;
gds_lock_dir_access = 335544992;
gds_invalid_fetch_option = 335544993;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/include/gen/codetext.h 2012-02-25 13:55:04 UTC (rev 54045)
@@ -691,7 +691,7 @@
{"no_trusted_spb", 335544987},
{"package_name", 335544988},
{"cannot_make_not_null", 335544989},
- {"feature_deprecated", 335544990},
+ {"feature_removed", 335544990},
{"view_name", 335544991},
{"lock_dir_access", 335544992},
{"invalid_fetch_option", 335544993},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/include/gen/iberror.h 2012-02-25 13:55:04 UTC (rev 54045)
@@ -725,7 +725,7 @@
const ISC_STATUS isc_no_trusted_spb = 335544987L;
const ISC_STATUS isc_package_name = 335544988L;
const ISC_STATUS isc_cannot_make_not_null = 335544989L;
-const ISC_STATUS isc_feature_deprecated = 335544990L;
+const ISC_STATUS isc_feature_removed = 335544990L;
const ISC_STATUS isc_view_name = 335544991L;
const ISC_STATUS isc_lock_dir_access = 335544992L;
const ISC_STATUS isc_invalid_fetch_option = 335544993L;
@@ -1905,7 +1905,7 @@
#define isc_no_trusted_spb 335544987L
#define isc_package_name 335544988L
#define isc_cannot_make_not_null 335544989L
-#define isc_feature_deprecated 335544990L
+#define isc_feature_removed 335544990L
#define isc_view_name 335544991L
#define isc_lock_dir_access 335544992L
#define isc_invalid_fetch_option 335544993L
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/include/gen/msgs.h 2012-02-25 13:55:04 UTC (rev 54045)
@@ -694,7 +694,7 @@
{335544987, "Use of TRUSTED switches in spb_command_line is prohibited"}, /* no_trusted_spb */
{335544988, "PACKAGE @1"}, /* package_name */
{335544989, "Cannot make field @1 of table @2 NOT NULL because there are NULLs present"}, /* cannot_make_not_null */
- {335544990, "Feature @1 is deprecated"}, /* feature_deprecated */
+ {335544990, "Feature @1 is not supported any more"}, /* feature_removed */
{335544991, "VIEW @1"}, /* view_name */
{335544992, "Can not access lock files directory @1"}, /* lock_dir_access */
{335544993, "Fetch option @1 is invalid for a non-scrollable cursor"}, /* invalid_fetch_option */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/include/gen/sql_code.h 2012-02-25 13:55:04 UTC (rev 54045)
@@ -690,7 +690,7 @@
{335544987, -902}, /* 667 no_trusted_spb */
{335544988, -901}, /* 668 package_name */
{335544989, -901}, /* 669 cannot_make_not_null */
- {335544990, -901}, /* 670 feature_deprecated */
+ {335544990, -901}, /* 670 feature_removed */
{335544991, -901}, /* 671 view_name */
{335544992, -904}, /* 672 lock_dir_access */
{335544993, -901}, /* 673 invalid_fetch_option */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/include/gen/sql_state.h 2012-02-25 13:55:04 UTC (rev 54045)
@@ -690,7 +690,7 @@
{335544987, "28000"}, // 667 no_trusted_spb
{335544988, "42000"}, // 668 package_name
{335544989, "22006"}, // 669 cannot_make_not_null
- {335544990, "0A000"}, // 670 feature_deprecated
+ {335544990, "0A000"}, // 670 feature_removed
{335544991, "00000"}, // 671 view_name
{335544992, "08006"}, // 672 lock_dir_access
{335544993, "HY106"}, // 673 invalid_fetch_option
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/jrd/jrd.cpp 2012-02-25 13:55:04 UTC (rev 54045)
@@ -2638,7 +2638,7 @@
* This function is deprecated and "removed".
*
**************************************/
- status->set((Arg::Gds(isc_feature_deprecated) << Arg::Str("isc_ddl")).value());
+ status->set((Arg::Gds(isc_feature_removed) << Arg::Str("isc_ddl")).value());
}
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/msgs/messages2.sql 2012-02-25 13:55:04 UTC (rev 54045)
@@ -777,7 +777,7 @@
('no_trusted_spb', NULL, 'svc.cpp', NULL, 0, 667, NULL, 'Use of TRUSTED switches in spb_command_line is prohibited', NULL, NULL)
('package_name', 'check_dependencies', 'dfw.epp', NULL, 0, 668, NULL, 'PACKAGE @1', NULL, NULL);
('cannot_make_not_null', 'check_not_null', 'dfw.epp', NULL, 0, 669, NULL, 'Cannot make field @1 of table @2 NOT NULL because there are NULLs present', NULL, NULL);
-('feature_deprecated', NULL, '', NULL, 0, 670, NULL, 'Feature @1 is deprecated', NULL, NULL);
+('feature_removed', NULL, '', NULL, 0, 670, NULL, 'Feature @1 is not supported any more', NULL, NULL);
('view_name', 'check_dependencies', 'dfw.epp', NULL, 0, 671, NULL, 'VIEW @1', NULL, NULL);
('lock_dir_access', 'createLockDirectory', 'os_utils.cpp', NULL, 0, 672, NULL, 'Can not access lock files directory @1', NULL, NULL);
('invalid_fetch_option', NULL, 'Cursor.cpp', NULL, 0, 673, NULL, 'Fetch option @1 is invalid for a non-scrollable cursor', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/msgs/system_errors2.sql 2012-02-25 13:55:04 UTC (rev 54045)
@@ -675,7 +675,7 @@
(-902, '28', '000', 0, 667, 'no_trusted_spb', NULL, NULL)
(-901, '42', '000', 0, 668, 'package_name', NULL, NULL)
(-901, '22', '006', 0, 669, 'cannot_make_not_null', NULL, NULL)
-(-901, '0A', '000', 0, 670, 'feature_deprecated', NULL, NULL)
+(-901, '0A', '000', 0, 670, 'feature_removed', NULL, NULL)
(-901, '00', '000', 0, 671, 'view_name', NULL, NULL)
(-904, '08', '006', 0, 672, 'lock_dir_access', NULL, NULL)
(-901, 'HY', '106', 0, 673, 'invalid_fetch_option', NULL, NULL)
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2012-02-25 13:53:49 UTC (rev 54044)
+++ firebird/trunk/src/yvalve/why.cpp 2012-02-25 13:55:04 UTC (rev 54045)
@@ -2250,7 +2250,7 @@
ISC_STATUS API_ROUTINE isc_dsql_insert(ISC_STATUS* userStatus, FB_API_HANDLE* /*stmtHandle*/,
USHORT /*dialect*/, XSQLDA* /*sqlda*/)
{
- (Arg::Gds(isc_feature_deprecated) << Arg::Str("isc_dsql_insert")).copyTo(userStatus);
+ (Arg::Gds(isc_feature_removed) << Arg::Str("isc_dsql_insert")).copyTo(userStatus);
return userStatus[1];
}
@@ -2260,7 +2260,7 @@
USHORT /*blrLength*/, const SCHAR* /*blr*/,
USHORT /*msgType*/, USHORT /*msgLength*/, const SCHAR* /*msg*/)
{
- (Arg::Gds(isc_feature_deprecated) << Arg::Str("isc_dsql_insert")).copyTo(userStatus);
+ (Arg::Gds(isc_feature_removed) << Arg::Str("isc_dsql_insert")).copyTo(userStatus);
return userStatus[1];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
