[Firebird-checkins] CVS: firebird2/src/remote inet.cpp, 1.207, 1.208 server.cpp, 1.176, 1.177

[Claudio V. C. <ro...@us...>]

Build Version :  T2.5.0.18792 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18952 2008/03/13 10:41:45 robocop Exp )

Update of /cvsroot/firebird/firebird2/src/remote
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28711/src/remote

Modified Files:
	inet.cpp server.cpp 
Log Message:
Misc.

Index: inet.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/inet.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -b -U3 -r1.207 -r1.208
--- inet.cpp	12 Mar 2008 16:39:44 -0000	1.207
+++ inet.cpp	13 Mar 2008 10:41:38 -0000	1.208
@@ -2625,7 +2625,7 @@
  *
  **************************************/
 #ifdef REM_SERVER
-	rem_port* port = (rem_port*) xdrs->x_public;
+	const rem_port* port = (rem_port*) xdrs->x_public;
 	if (port->port_flags & PORT_server) {
 		return REMOTE_getbytes(xdrs, buff, count);
 	}
@@ -2681,7 +2681,7 @@
 
 	return TRUE;
 }
-//#endif
+
 
 static bool_t inet_getlong( XDR * xdrs, SLONG * lp)
 {

Index: server.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/server.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -b -U3 -r1.176 -r1.177
--- server.cpp	12 Mar 2008 16:39:44 -0000	1.176
+++ server.cpp	13 Mar 2008 10:41:38 -0000	1.177
@@ -223,7 +223,7 @@
 	static bool WakeUp();
 	static void WakeUpAll();
 
-	void setState(bool active);
+	void setState(const bool active);
 
 	static int getCount() 
 	{ return m_cntAll; }
@@ -233,10 +233,12 @@
 	Worker* m_prev;
 	Firebird::Semaphore m_sem;
 	bool	m_active;
+#ifdef DEV_BUILD
 	FB_THREAD_ID	m_tid;
+#endif
 
 	void remove();
-	void insert(bool active);
+	void insert(const bool active);
 
 	static Worker* m_activeWorkers;
 	static Worker* m_idleWorkers;
@@ -5579,7 +5581,9 @@
 {
 	m_active = false;
 	m_next = m_prev = NULL;
+#ifdef DEV_BUILD
 	m_tid = getThreadId();
+#endif
 
 	Firebird::MutexLockGuard guard(m_mutex);
 	++m_cntAll;
@@ -5598,7 +5602,7 @@
 	return m_sem.tryEnter(timeout);
 }
 
-void Worker::setState(bool active)
+void Worker::setState(const bool active)
 {
 	if (m_active == active)
 		return;
@@ -5622,8 +5626,7 @@
 void Worker::WakeUpAll()
 {
 	Firebird::MutexLockGuard guard(m_mutex);
-	Worker *thd = m_idleWorkers;
-	for (; thd; thd = thd->m_next)
+	for (Worker* thd = m_idleWorkers; thd; thd = thd->m_next)
 		thd->m_sem.release();
 }
 
@@ -5648,7 +5651,7 @@
 	m_prev = m_next = NULL;
 }
 
-void Worker::insert(bool active)
+void Worker::insert(const bool active)
 {
 	fb_assert(!m_next);
 	fb_assert(!m_prev);