From: Alexander P. <ale...@us...> - 2010-03-30 14:21:36
|
Build Version : T3.0.0.28129 Firebird 3.0 Unstable (writeBuildNum.sh,v 1.28304 2010/03/30 14:21:23 alexpeshkof ) Update of /cvsroot/firebird/firebird2/src/jrd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994 Modified Files: why.cpp why_proto.h Log Message: Cleanup SUPERCLIENT - was used to make yValve on client a few bytes smaller Index: why.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/why.cpp,v retrieving revision 1.275 retrieving revision 1.276 diff -b -U3 -r1.275 -r1.276 --- why.cpp 29 Mar 2010 16:00:00 -0000 1.275 +++ why.cpp 30 Mar 2010 14:21:22 -0000 1.276 @@ -150,9 +150,7 @@ } } -#if !defined (SUPERCLIENT) static bool disableConnections = false; -#endif typedef ISC_STATUS(*PTR) (ISC_STATUS* user_status, ...); @@ -967,9 +965,7 @@ return; } killed = sig; -#if !defined (SUPERCLIENT) disableConnections = true; -#endif shutdownSemaphore->release(); } @@ -1376,12 +1372,10 @@ status_exception::raise(Arg::Gds(isc_bad_dpb_form)); } -#if !defined (SUPERCLIENT) if (disableConnections) { status_exception::raise(Arg::Gds(isc_shutwarn)); } -#endif // !SUPERCLIENT ptr = status; @@ -1982,12 +1976,10 @@ status_exception::raise(Arg::Gds(isc_bad_dpb_form)); } -#if !defined (SUPERCLIENT) if (disableConnections) { status_exception::raise(Arg::Gds(isc_shutwarn)); } -#endif // !SUPERCLIENT ptr = status; @@ -4398,12 +4390,10 @@ status_exception::raise(Arg::Gds(isc_bad_spb_form)); } -#if !defined (SUPERCLIENT) if (disableConnections) { status_exception::raise(Arg::Gds(isc_shutwarn)); } -#endif // !SUPERCLIENT string svcname(service_name, service_length ? service_length : strlen(service_name)); svcname.rtrim(); @@ -5703,7 +5693,6 @@ } -#if !defined (SUPERCLIENT) bool WHY_set_shutdown(bool flag) { /************************************** @@ -5725,23 +5714,6 @@ return old_flag; } -bool WHY_get_shutdown() -{ -/************************************** - * - * W H Y _ g e t _ s h u t d o w n - * - ************************************** - * - * Functional description - * Returns the current value of disableConnections. - * - **************************************/ - - return disableConnections; -} -#endif // !SUPERCLIENT - static GlobalPtr<Mutex> singleShutdown; Index: why_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/why_proto.h,v retrieving revision 1.57 retrieving revision 1.58 diff -b -U3 -r1.57 -r1.58 --- why_proto.h 25 Nov 2009 09:44:14 -0000 1.57 +++ why_proto.h 30 Mar 2010 14:21:22 -0000 1.58 @@ -254,7 +254,6 @@ TransactionCleanupRoutine*, void*); bool WHY_set_shutdown(bool); -bool WHY_get_shutdown(); #ifdef __cplusplus |