From: <asf...@us...> - 2013-11-21 01:17:11
|
Revision: 58815 http://sourceforge.net/p/firebird/code/58815 Author: asfernandes Date: 2013-11-21 01:17:08 +0000 (Thu, 21 Nov 2013) Log Message: ----------- Misc. Modified Paths: -------------- firebird/trunk/doc/README.interfaces.html firebird/trunk/doc/README.services_extension firebird/trunk/src/auth/SecureRemotePassword/srp.cpp firebird/trunk/src/common/classes/SyncObject.cpp firebird/trunk/src/common/common.h firebird/trunk/src/common/config/os/darwin/config_root.cpp firebird/trunk/src/iscguard/iscguard.cpp firebird/trunk/src/jrd/met.epp firebird/trunk/src/jrd/tra.cpp firebird/trunk/src/remote/server/server.cpp firebird/trunk/src/yvalve/PluginManager.cpp Modified: firebird/trunk/doc/README.interfaces.html =================================================================== --- firebird/trunk/doc/README.interfaces.html 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/doc/README.interfaces.html 2013-11-21 01:17:08 UTC (rev 58815) @@ -126,10 +126,10 @@ implementation of interfaces: it should not contain virtual functions (including virtual destructor) except those defined in interface definition. This is because interface upgrade process modifies table -of virtual functions, and for successful upgrade number of functions -in interface implementation should exactly match one in it's +of virtual functions, and for successful upgrade, number of functions +in interface implementation should exactly match one in its definition. Pointer to functions, missing in interface definition but -added in it's implementation, may be </FONT><FONT COLOR="#ff0000"><FONT SIZE=4>overwritten</FONT></FONT><FONT SIZE=4> +added in its implementation, may be </FONT><FONT COLOR="#ff0000"><FONT SIZE=4>overwritten</FONT></FONT><FONT SIZE=4> with a pointer to function used to upgrade interface.</FONT></P> <P STYLE="margin-bottom: 0in"><BR> </P> Modified: firebird/trunk/doc/README.services_extension =================================================================== --- firebird/trunk/doc/README.services_extension 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/doc/README.services_extension 2013-11-21 01:17:08 UTC (rev 58815) @@ -197,7 +197,7 @@ (Alex Peshkov, pes...@ma..., 2013) If one wants to use services API to access database which is configured to use -non-default security database new SPB item isc_spb_expected_db should be used +non-default security database, new SPB item isc_spb_expected_db should be used when attaching to services manager. Value of this item is a database which is expected to be accessed. Modified: firebird/trunk/src/auth/SecureRemotePassword/srp.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/srp.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/auth/SecureRemotePassword/srp.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -216,7 +216,7 @@ void dumpBin(const char* name, const Firebird::string& str) { fprintf(stderr, "%s (%ld)\n", name, str.length()); - for (size_t x=0; x<str.length(); ++x) + for (size_t x = 0; x < str.length(); ++x) fprintf(stderr, "%02x ", str[x]); fprintf(stderr, "\n"); } Modified: firebird/trunk/src/common/classes/SyncObject.cpp =================================================================== --- firebird/trunk/src/common/classes/SyncObject.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/common/classes/SyncObject.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -306,7 +306,7 @@ if (thread->lockGranted) return true; - (void)wakeup; + (void) wakeup; //if (!wakeup) // stalled(thread); Modified: firebird/trunk/src/common/common.h =================================================================== --- firebird/trunk/src/common/common.h 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/common/common.h 2013-11-21 01:17:08 UTC (rev 58815) @@ -890,7 +890,7 @@ #define FB_FINAL #endif -#define FB_UNUSED(value) do { if(value); } while (false) +#define FB_UNUSED(value) do { if (value); } while (false) // 30 Dec 2002. Nickolay Samofatov // This needs to be checked for all supported platforms Modified: firebird/trunk/src/common/config/os/darwin/config_root.cpp =================================================================== --- firebird/trunk/src/common/config/os/darwin/config_root.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/common/config/os/darwin/config_root.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -82,7 +82,7 @@ _NSGetExecutablePath(file_buff, &bufsize); char canonic[PATH_MAX]; if (!realpath(file_buff, canonic)) - Firebird::system_call_failed::raise("realpath"); + Firebird::system_call_failed::raise("realpath"); string bin_dir = canonic; // get rid of the filename int index = bin_dir.rfind(PathUtils::dir_sep); @@ -93,7 +93,7 @@ return dir; } - + void ConfigRoot::osConfigRoot() { // Attempt to locate the Firebird.framework bundle @@ -110,7 +110,7 @@ } // As a last resort get it from the default install directory - root_dir = FB_PREFIX; + root_dir = FB_PREFIX; } @@ -130,5 +130,5 @@ } // As a last resort get it from the default install directory - install_dir = FB_PREFIX; + install_dir = FB_PREFIX; } Modified: firebird/trunk/src/iscguard/iscguard.cpp =================================================================== --- firebird/trunk/src/iscguard/iscguard.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/iscguard/iscguard.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -1151,7 +1151,7 @@ FORMAT_MESSAGE_FROM_STRING, tmp_buff, 0, 0, (LPTSTR) &lpMsgBuf, 0, reinterpret_cast<va_list*>(act_buff)); - + const int len = MIN(BUFF_SIZE-1, strlen(lpMsgBuf) - 1); strncpy(act_buff[0], lpMsgBuf, len); act_buff[0][len] = 0; Modified: firebird/trunk/src/jrd/met.epp =================================================================== --- firebird/trunk/src/jrd/met.epp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/jrd/met.epp 2013-11-21 01:17:08 UTC (rev 58815) @@ -1011,7 +1011,7 @@ if (!(relation->rel_flags & REL_scanned)) { AutoCacheRequest request(tdbb, irq_l_curr_format, IRQ_REQUESTS); - + FOR(REQUEST_HANDLE request) REL IN RDB$RELATIONS WITH REL.RDB$RELATION_ID EQ relation->rel_id { @@ -1024,7 +1024,7 @@ // However, system tables have zero as their initial format and they don't have // any related records in RDB$FORMATS, instead their rel_formats[0] is initialized // directly (see ini.epp). Every other case of zero format number found for an already - // scanned table must be catched here and investigated. + // scanned table must be catched here and investigated. fb_assert(relation->rel_current_fmt || relation->isSystem()); relation->rel_current_format = MET_format(tdbb, relation, relation->rel_current_fmt); Modified: firebird/trunk/src/jrd/tra.cpp =================================================================== --- firebird/trunk/src/jrd/tra.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/jrd/tra.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -1881,7 +1881,7 @@ return number; // If this is the first transaction on a TIP, allocate the TIP now. - // Note, first TIP page is created with the database itself, + // Note, first TIP page is created with the database itself, // see JProvider::createDatabase. const bool new_tip = ((number % dbb->dbb_page_manager.transPerTIP) == 0); @@ -1933,7 +1933,7 @@ const TraNumber number = header->hdr_next_transaction + 1; // If this is the first transaction on a TIP, allocate the TIP now. - // Note, first TIP page is created with the database itself, + // Note, first TIP page is created with the database itself, // see JProvider::createDatabase. const bool new_tip = ((number % dbb->dbb_page_manager.transPerTIP) == 0); @@ -2527,7 +2527,7 @@ * * Functional description * Flush pages modified by user and\or system transaction. - * Note, flush of user transaction also flushed pages, + * Note, flush of user transaction also flushed pages, * changed by system transaction. * **************************************/ Modified: firebird/trunk/src/remote/server/server.cpp =================================================================== --- firebird/trunk/src/remote/server/server.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/remote/server/server.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -1747,7 +1747,7 @@ { AuthServerPlugins* const plugins = port->port_srv_auth_block->plugins; NoCaseString clientPluginName(port->port_srv_auth_block->getPluginName()); - // If there is plugin matching client's one it will be + // If there is plugin matching client's one it will be HANDSHAKE_DEBUG(fprintf(stderr, "Srv: accept_connection: client plugin='%s' server='%s'\n", clientPluginName.c_str(), plugins->name())); Modified: firebird/trunk/src/yvalve/PluginManager.cpp =================================================================== --- firebird/trunk/src/yvalve/PluginManager.cpp 2013-11-21 01:11:10 UTC (rev 58814) +++ firebird/trunk/src/yvalve/PluginManager.cpp 2013-11-21 01:17:08 UTC (rev 58815) @@ -543,7 +543,7 @@ ~FactoryParameter() { #ifdef DEBUG_PLUGINS - fprintf(stderr, "~FactoryParameter places configuredPlugin %s in unload query for %d seconds\n", + fprintf(stderr, "~FactoryParameter places configuredPlugin %s in unload query for %d seconds\n", configuredPlugin->getPlugName(), configuredPlugin->getReleaseDelay() / 1000000); #endif TimerInterfacePtr()->start(configuredPlugin, configuredPlugin->getReleaseDelay()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |