From 6a3b45e1daf9a6df5300b64187f22157cd8ab41b Mon Sep 17 00:00:00 2001 From: robocop Date: Tue, 27 Dec 2005 08:10:00 +0000 Subject: [PATCH] Misc. --- doc/README.incompatibilities.txt | 2 +- src/include/gen/iberror.h | 16 ++++++++-------- src/misc/codes.epp | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/README.incompatibilities.txt b/doc/README.incompatibilities.txt index d774d7e2f4..7b382b6fb9 100644 --- a/doc/README.incompatibilities.txt +++ b/doc/README.incompatibilities.txt @@ -17,7 +17,7 @@ INSTALLATION/CONFIGURATION installation, please be sure to upgrade the security database using the provided script in order to keep your users' logins. For more details see $FBROOT/upgrade/security_database.txt. - Simple 'cp security.fdb security2.fdb' makes is impossible to attach + Simple 'cp security.fdb security2.fdb' makes it impossible to attach to the firebird server ! * Password hashes are now generated using the SHA-1 algorithm instead of the diff --git a/src/include/gen/iberror.h b/src/include/gen/iberror.h index e76c2edba0..56accc72546 100644 --- a/src/include/gen/iberror.h +++ b/src/include/gen/iberror.h @@ -40,19 +40,19 @@ const ISC_LONG isc_base = 335544320L; const ISC_LONG isc_factor = 1; const ISC_LONG isc_arg_end = 0; // end of argument list const ISC_LONG isc_arg_gds = 1; // generic DSRI status value -const ISC_LONG isc_arg_string = 2; // string argument +const ISC_LONG isc_arg_string = 2; // string argument const ISC_LONG isc_arg_cstring = 3; // count & string argument -const ISC_LONG isc_arg_number = 4; // numeric argument (long) +const ISC_LONG isc_arg_number = 4; // numeric argument (long) const ISC_LONG isc_arg_interpreted = 5; // interpreted status code (string) const ISC_LONG isc_arg_vms = 6; // VAX/VMS status code (long) -const ISC_LONG isc_arg_unix = 7; // UNIX error code -const ISC_LONG isc_arg_domain = 8; // Apollo/Domain error code +const ISC_LONG isc_arg_unix = 7; // UNIX error code +const ISC_LONG isc_arg_domain = 8; // Apollo/Domain error code const ISC_LONG isc_arg_dos = 9; // MSDOS/OS2 error code -const ISC_LONG isc_arg_mpexl = 10; // HP MPE/XL error code -const ISC_LONG isc_arg_mpexl_ipc = 11; // HP MPE/XL IPC error code -const ISC_LONG isc_arg_next_mach = 15; // NeXT/Mach error code +const ISC_LONG isc_arg_mpexl = 10; // HP MPE/XL error code +const ISC_LONG isc_arg_mpexl_ipc = 11; // HP MPE/XL IPC error code +const ISC_LONG isc_arg_next_mach = 15; // NeXT/Mach error code const ISC_LONG isc_arg_netware = 16; // NetWare error code -const ISC_LONG isc_arg_win32 = 17; // Win32 error code +const ISC_LONG isc_arg_win32 = 17; // Win32 error code const ISC_LONG isc_arg_warning = 18; // warning argument const ISC_LONG isc_arith_except = 335544321L; diff --git a/src/misc/codes.epp b/src/misc/codes.epp index 105d41d779..0c503ded8e 100644 --- a/src/misc/codes.epp +++ b/src/misc/codes.epp @@ -138,6 +138,7 @@ static const SCHAR *gds_c_boiler_plate[] = { "", }; +/* It's used only in code that's commented now: build_codes_h(). static const SCHAR *gds_cpp_boiler_plate[] = { "const SLONG gds_arg_end = 0; // end of argument list", "const SLONG gds_arg_gds = 1; // generic DSRI status value", @@ -159,6 +160,7 @@ static const SCHAR *gds_cpp_boiler_plate[] = { "const SLONG gds_arg_warning = 18; // warning argument", "", }; +*/ // At first glance, it wasn't evident why isc_facility had to be undefined, // but it turns that this file includes ibase.h,