From: <asf...@us...> - 2013-04-07 23:48:17
|
Revision: 57915 http://sourceforge.net/p/firebird/code/57915 Author: asfernandes Date: 2013-04-07 23:48:14 +0000 (Sun, 07 Apr 2013) Log Message: ----------- Misc. Modified Paths: -------------- firebird/trunk/builds/install/misc/firebird.conf.in firebird/trunk/src/remote/inet.cpp firebird/trunk/src/remote/os/win32/wnet.cpp firebird/trunk/src/remote/os/win32/xnet.cpp firebird/trunk/src/remote/remot_proto.h firebird/trunk/src/remote/remote.cpp firebird/trunk/src/remote/remote.h firebird/trunk/src/remote/server/server.cpp Modified: firebird/trunk/builds/install/misc/firebird.conf.in =================================================================== --- firebird/trunk/builds/install/misc/firebird.conf.in 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/builds/install/misc/firebird.conf.in 2013-04-07 23:48:14 UTC (rev 57915) @@ -20,7 +20,7 @@ # value. # # Please note, by default a number of the values are specified in **Bytes** (Not KB). -# You may add obvious abbreviations k, m and g in the end of a numver to specify +# You may add obvious abbreviations k, m and g in the end of a number to specify # kilobytes, megabytes and gigabytes. # # There are three types of configuration values: integer, boolean and string. Modified: firebird/trunk/src/remote/inet.cpp =================================================================== --- firebird/trunk/src/remote/inet.cpp 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/inet.cpp 2013-04-07 23:48:14 UTC (rev 57915) @@ -2732,7 +2732,7 @@ return port; } -static bool_t inet_write( XDR* xdrs ) +static bool_t inet_write(XDR* xdrs) { /************************************** * Modified: firebird/trunk/src/remote/os/win32/wnet.cpp =================================================================== --- firebird/trunk/src/remote/os/win32/wnet.cpp 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/os/win32/wnet.cpp 2013-04-07 23:48:14 UTC (rev 57915) @@ -587,7 +587,8 @@ port->port_async = new_port; new_port->port_flags = port->port_flags & PORT_no_oob; new_port->port_flags |= PORT_async; - new_port->port_connection = make_pipe_name(port->getPortConfig(), port->port_connection->str_data, EVENT_PIPE_SUFFIX, p); + new_port->port_connection = make_pipe_name(port->getPortConfig(), + port->port_connection->str_data, EVENT_PIPE_SUFFIX, p); while (true) { @@ -635,8 +636,8 @@ TEXT str_pid[32]; wnet_make_file_name(str_pid, server_pid); - new_port->port_connection = - make_pipe_name(vport->getPortConfig(), vport->port_connection->str_data, EVENT_PIPE_SUFFIX, str_pid); + new_port->port_connection = make_pipe_name(vport->getPortConfig(), + vport->port_connection->str_data, EVENT_PIPE_SUFFIX, str_pid); new_port->port_pipe = CreateNamedPipe(new_port->port_connection->str_data, @@ -796,7 +797,8 @@ #endif -static rem_str* make_pipe_name(const RefPtr<Config>& config, const TEXT* connect_name, const TEXT* suffix_name, const TEXT* str_pid) +static rem_str* make_pipe_name(const RefPtr<Config>& config, const TEXT* connect_name, + const TEXT* suffix_name, const TEXT* str_pid) { /************************************** * Modified: firebird/trunk/src/remote/os/win32/xnet.cpp =================================================================== --- firebird/trunk/src/remote/os/win32/xnet.cpp 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/os/win32/xnet.cpp 2013-04-07 23:48:14 UTC (rev 57915) @@ -396,7 +396,8 @@ // Initialize server-side IPC endpoint to a value we know we have permissions to listen at if (strcmp(xnet_endpoint, "") == 0) { - fb_utils::copy_terminate(xnet_endpoint, Config::getDefaultConfig()->getIpcName(), sizeof(xnet_endpoint)); + fb_utils::copy_terminate(xnet_endpoint, Config::getDefaultConfig()->getIpcName(), + sizeof(xnet_endpoint)); fb_utils::prefix_kernel_object_name(xnet_endpoint, sizeof(xnet_endpoint)); } @@ -2136,7 +2137,8 @@ // Initialize server-side IPC endpoint to a value we know we have permissions to listen at if (strcmp(xnet_endpoint, "") == 0) { - fb_utils::copy_terminate(xnet_endpoint, Config::getDefaultConfig()->getIpcName(), sizeof(name_buffer)); + fb_utils::copy_terminate(xnet_endpoint, Config::getDefaultConfig()->getIpcName(), + sizeof(name_buffer)); fb_utils::prefix_kernel_object_name(xnet_endpoint, sizeof(xnet_endpoint)); } Modified: firebird/trunk/src/remote/remot_proto.h =================================================================== --- firebird/trunk/src/remote/remot_proto.h 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/remot_proto.h 2013-04-07 23:48:14 UTC (rev 57915) @@ -58,7 +58,8 @@ void REMOTE_save_status_strings (ISC_STATUS *); bool_t REMOTE_getbytes (XDR*, SCHAR*, u_int); bool REMOTE_legacy_auth(const char* nm, int protocol); -Firebird::RefPtr<Config> REMOTE_get_config(const Firebird::PathName* dbName, const Firebird::string* dpb_config); +Firebird::RefPtr<Config> REMOTE_get_config(const Firebird::PathName* dbName, + const Firebird::string* dpb_config); void REMOTE_parseList(Remote::ParsedList&, Firebird::PathName); void REMOTE_makeList(Firebird::PathName& list, const Remote::ParsedList& parsed); void REMOTE_check_response(Firebird::IStatus* warning, Rdb* rdb, PACKET* packet, bool checkKeys = false); Modified: firebird/trunk/src/remote/remote.cpp =================================================================== --- firebird/trunk/src/remote/remote.cpp 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/remote.cpp 2013-04-07 23:48:14 UTC (rev 57915) @@ -441,8 +441,8 @@ fb_assert(isc_dpb_connect_timeout == isc_spb_connect_timeout); - port->port_connect_timeout = - pb && pb->find(isc_dpb_connect_timeout) ? pb->getInt() : port->getPortConfig()->getConnectionTimeout(); + port->port_connect_timeout = pb && pb->find(isc_dpb_connect_timeout) ? + pb->getInt() : port->getPortConfig()->getConnectionTimeout(); port->port_flags |= PORT_dummy_pckt_set; port->port_dummy_packet_interval = port->getPortConfig()->getDummyPacketInterval(); Modified: firebird/trunk/src/remote/remote.h =================================================================== --- firebird/trunk/src/remote/remote.h 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/remote.h 2013-04-07 23:48:14 UTC (rev 57915) @@ -650,7 +650,8 @@ bool authComplete; // Set as response from client that authentication accepted bool firstTime; // Invoked first time after reset - ClntAuthBlock(const Firebird::PathName* fileName, Firebird::ClumpletReader* dpb, const ParametersSet* tags); + ClntAuthBlock(const Firebird::PathName* fileName, Firebird::ClumpletReader* dpb, + const ParametersSet* tags); ~ClntAuthBlock() { Modified: firebird/trunk/src/remote/server/server.cpp =================================================================== --- firebird/trunk/src/remote/server/server.cpp 2013-04-07 07:55:40 UTC (rev 57914) +++ firebird/trunk/src/remote/server/server.cpp 2013-04-07 23:48:14 UTC (rev 57915) @@ -5132,7 +5132,7 @@ } } - // See if user has specified parameters relevent to the connection, + // See if user has specified parameters relevant to the connection, // they will be stuffed in the SPB if so. REMOTE_get_timeout_params(this, spb); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |