firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 17:23:03 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2009-01-17 19:07:07 +00:00
parent d65f9ef61a
commit cd010ff939
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/README.user.troubleshooting
View File

@ -81,7 +81,7 @@ your circumstance.
For inetd the /etc/inetd.conf file should have a line as follows For inetd the /etc/inetd.conf file should have a line as follows
gds_db stream tcp nowait.30000 root /opt/firebird/bin/gds_inet_server gds_inet_server gds_db stream tcp nowait.30000 root /opt/firebird/bin/fb_inet_server gds_inet_server
You will need to restart the inetd process before the server will work. You will need to restart the inetd process before the server will work.
$ps -ef | grep inetd $ps -ef | grep inetd

10
src/jrd/svc.cpp
View File

@ -1916,7 +1916,7 @@ void Service::readFbLog()
} }
} }
if (!file || file && ferror(file)) if (!file || (file && ferror(file)))
{ {
(Arg::Gds(isc_sys_request) << Arg::Str(file ? "fgets" : "fopen") << (Arg::Gds(isc_sys_request) << Arg::Str(file ? "fgets" : "fopen") <<
SYS_ERR(errno)).copyTo(svc_status); SYS_ERR(errno)).copyTo(svc_status);
@ -1981,7 +1981,7 @@ bool Service::full() const
void Service::enqueue(const UCHAR* s, ULONG len) void Service::enqueue(const UCHAR* s, ULONG len)
{ {
if (checkForShutdown() || svc_flags & SVC_detached) if (checkForShutdown() || (svc_flags & SVC_detached))
{ {
return; return;
} }
@ -1992,7 +1992,7 @@ void Service::enqueue(const UCHAR* s, ULONG len)
while (full()) while (full())
{ {
THREAD_SLEEP(1); THREAD_SLEEP(1);
if (checkForShutdown() || svc_flags & SVC_detached) if (checkForShutdown() || (svc_flags & SVC_detached))
{ {
return; return;
} }
@ -2037,7 +2037,7 @@ void Service::get(SCHAR* buffer, USHORT length, USHORT flags, USHORT timeout, US
while (length) while (length)
{ {
if ((empty() && svc_flags & SVC_finished) || checkForShutdown()) if ((empty() && (svc_flags & SVC_finished)) || checkForShutdown())
{ {
break; break;
} }
@ -2072,7 +2072,7 @@ void Service::get(SCHAR* buffer, USHORT length, USHORT flags, USHORT timeout, US
* characters with a space. This will ensure that the output is * characters with a space. This will ensure that the output is
* consistent when returning a line or to eof * consistent when returning a line or to eof
*/ */
if ((flags & GET_LINE) && (ch == '\n')) if ((flags & GET_LINE) && ch == '\n')
{ {
buffer[(*return_length)++] = ' '; buffer[(*return_length)++] = ' ';
length = 0; length = 0;

14
src/remote/interface.cpp
View File

@ -1317,7 +1317,7 @@ ISC_STATUS GDS_DSQL_EXECUTE2(ISC_STATUS* user_status,
} }
} }
RMessage* message = 0; RMessage* message = NULL;
if (!statement->rsr_buffer) if (!statement->rsr_buffer)
{ {
statement->rsr_buffer = message = new RMessage(0); statement->rsr_buffer = message = new RMessage(0);
@ -2055,7 +2055,7 @@ ISC_STATUS GDS_DSQL_INSERT(ISC_STATUS* user_status,
} }
} }
RMessage* message = 0; RMessage* message = NULL;
if (!statement->rsr_buffer) if (!statement->rsr_buffer)
{ {
statement->rsr_buffer = message = new RMessage(0); statement->rsr_buffer = message = new RMessage(0);
@ -3307,11 +3307,12 @@ ISC_STATUS GDS_RECEIVE(ISC_STATUS * user_status,
could dynamically adjust batching sizes based on fetch patterns */ could dynamically adjust batching sizes based on fetch patterns */
if (port->port_flags & PORT_rpc) if (port->port_flags & PORT_rpc)
{
/* This is an RPC (remote procedure call) port - we just do /* This is an RPC (remote procedure call) port - we just do
one at a time processing as that's how RPC works. */ one at a time processing as that's how RPC works. */
data->p_data_messages = 1; data->p_data_messages = 1;
}
else else
{ {
data->p_data_messages = data->p_data_messages =
@ -4226,7 +4227,7 @@ ISC_STATUS GDS_START_TRANSACTION(ISC_STATUS* user_status,
try try
{ {
if ((tpb_length < 0) || (tpb_length > 0 && !tpb)) if (tpb_length < 0 || (tpb_length > 0 && !tpb))
{ {
status_exception::raise(Arg::Gds(isc_bad_tpb_form)); status_exception::raise(Arg::Gds(isc_bad_tpb_form));
} }
@ -4416,8 +4417,7 @@ ISC_STATUS GDS_TRANSACTION_INFO(ISC_STATUS* user_status,
try try
{ {
status = info(user_status, rdb, op_info_transaction, transaction->rtr_id, 0, status = info(user_status, rdb, op_info_transaction, transaction->rtr_id, 0,
item_length, items, 0, 0, item_length, items, 0, 0, buffer_length, buffer);
buffer_length, buffer);
} }
catch (const Exception& ex) catch (const Exception& ex)
{ {
@ -6190,7 +6190,7 @@ static void dequeue_receive( rem_port* port)
} }
static bool receive_response(Rdb* rdb, PACKET * packet) static bool receive_response(Rdb* rdb, PACKET* packet)
{ {
/************************************** /**************************************
* *

2
src/remote/os/win32/property.cpp
View File

@ -262,7 +262,7 @@ LRESULT CALLBACK GeneralPage(HWND hDlg, UINT unMsg, WPARAM wParam, LPARAM lParam
return FALSE; return FALSE;
} }
static char *MakeVersionString(char *pchBuf, int nLen, USHORT usServerFlagMask) static char* MakeVersionString(char* pchBuf, int nLen, USHORT usServerFlagMask)
{ {
/****************************************************************************** /******************************************************************************
* *

2
src/remote/parser.cpp
View File

@ -266,7 +266,7 @@ const UCHAR* PARSE_prepare_messages(const UCHAR* blr, USHORT blr_length)
const UCHAR* new_blr = blr; const UCHAR* new_blr = blr;
const SSHORT version = *blr++; const SSHORT version = *blr++;
if (((version != blr_version4) && (version != blr_version5)) || *blr++ != blr_begin) if ((version != blr_version4 && version != blr_version5) || *blr++ != blr_begin)
{ {
return old_blr; return old_blr;
} }

6
src/remote/server.cpp
View File

@ -220,9 +220,9 @@ bool Worker::shutting_down = false;
static Firebird::GlobalPtr<Firebird::Mutex> request_que_mutex; static Firebird::GlobalPtr<Firebird::Mutex> request_que_mutex;
static server_req_t* request_que = NULL; static server_req_t* request_que = NULL;
static server_req_t* free_requests = NULL; static server_req_t* free_requests = NULL;
static server_req_t* active_requests = NULL; static server_req_t* active_requests = NULL;
static Firebird::GlobalPtr<Firebird::Mutex> servers_mutex; static Firebird::GlobalPtr<Firebird::Mutex> servers_mutex;
static SRVR servers; static SRVR servers;

4
src/remote/server_stub.cpp
View File

@ -4,11 +4,11 @@
#ifndef MINGW #ifndef MINGW
extern "C" { extern "C" {
int CLIB_ROUTINE server_main( int argc, char** argv); int CLIB_ROUTINE server_main(int argc, char** argv);
} }
// This routine invokes server loop implemented in the shared library // This routine invokes server loop implemented in the shared library
int CLIB_ROUTINE main( int argc, char** argv) int CLIB_ROUTINE main(int argc, char** argv)
{ {
return server_main(argc, argv); return server_main(argc, argv);
} }