[Firebird-checkins] CVS: interclient/20/dev/interserver CDR.cpp,1.1.1.1,1.2 CDR.h,1.1.1.1,1.2 Error.cpp,1.1.1.1,1.2 IB_Defines.h,1.2,1.3 JIBSNet.cpp,1.1.1.1,1.2 NetTCP.cpp,1.3,1.4 interserver.cpp,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interclient/20/dev/interserver
In directory usw-pr-cvs1:/tmp/cvs-serv7232

Modified Files:
	CDR.cpp CDR.h Error.cpp IB_Defines.h JIBSNet.cpp NetTCP.cpp 
	interserver.cpp 
Log Message:


Index: CDR.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/CDR.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- CDR.cpp	2000/08/03 21:07:43	1.1.1.1
+++ CDR.cpp	2001/04/17 12:49:43	1.2
@@ -112,7 +112,18 @@
   else
     old_realbuf = 0;
   oldMessageCertificate = messageCertificate;
+// fr...@us... temporary check
+#ifdef TRACEON
+  debugTraceAPointer ("next ", next);
+  debugTraceAPointer ("messageCertificate ", messageCertificate);
+#endif
+/* fr...@us...
+  ambiguous comparison of signed and unsigned ( UNIT_MAX is often an unsigned type )
+  aborts program on first call with next = 16 and messageCertificate = 0
+
   assert ((next - messageCertificate) < UINT_MAX);
+*/
+
   offset = (unsigned) (next - messageCertificate);
 
   //

Index: CDR.h
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/CDR.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- CDR.h	2000/08/03 21:07:44	1.1.1.1
+++ CDR.h	2001/04/17 12:49:43	1.2
@@ -24,6 +24,8 @@
 #ifdef TRACEON
 void debugTraceALine (char* where, char* what);
 void debugTraceAnInt (char* where, int what);
+//fr...@us... added function
+void debugTraceAPointer (char* where, void* what);
 #endif
 
 #ifdef WIN32
@@ -86,7 +88,12 @@
 #elif SIZEOF_LONG == 8
   typedef long LongLong;
   typedef unsigned long ULongLong;
-#elif defined (_MSC_VER) && _MSC_VER >= 900
+//fr...@us...
+// brought this in line with other header files to work with bcc32 5.2; was VC++ specific
+//#elif defined (_MSC_VER) && _MSC_VER >= 900
+#elif (defined(_MSC_VER) && defined(_WIN32)) || \
+    (defined(__BORLANDC__) && (defined(__WIN32__) || defined(__OS2__)))
+//end fr...@us...
   typedef __int64 LongLong;
   typedef unsigned __int64 ULongLong;
 #else

Index: Error.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/Error.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- Error.cpp	2000/08/03 21:07:43	1.1.1.1
+++ Error.cpp	2001/04/17 12:49:43	1.2
@@ -178,8 +178,12 @@
 #endif
 
 #ifndef linux
-extern int	sys_nerr;	/* # of error message strings in sys table */
-extern char	*sys_errlist[];	/* the system error message table */
+//fr...@us...
+// commented out as declarations exist in stdlib.h (bcc32 v.5.5)
+// better include with ifdef where necessary
+//extern int	sys_nerr;	/* # of error message strings in sys table */
+//extern char	*sys_errlist[];	/* the system error message table */
+//end fr...@us... 
 #endif
 
 char *

Index: IB_Defines.h
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/IB_Defines.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- IB_Defines.h	2001/02/03 08:32:30	1.2
+++ IB_Defines.h	2001/04/17 12:49:43	1.3
@@ -113,6 +113,8 @@
 #ifdef TRACEON
 void debugTraceALine (char* where, char* what);
 void debugTraceAnInt (char* where, int what);
+//fr...@us... added function
+void debugTraceAPointer (char* where, void* what);
 #endif
 
 void errorLog (char* what);

Index: JIBSNet.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/JIBSNet.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- JIBSNet.cpp	2000/08/03 21:07:49	1.1.1.1
+++ JIBSNet.cpp	2001/04/17 12:49:43	1.2
@@ -256,7 +256,10 @@
   templen = getLong ();
 
   cdr_.next = cdr_.buffer;
+/* fr...@us...
   if (!cdr_.buffer) // !!!what is this about?
+*/
+  if (cdr_.buffer == NULL)
     cdr_.grow (0);
 
   if (templen > cdr_.length)

Index: NetTCP.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/NetTCP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- NetTCP.cpp	2001/02/18 22:17:27	1.3
+++ NetTCP.cpp	2001/04/17 12:49:43	1.4
@@ -142,10 +142,11 @@
 NetTCP::netOpen (int sockfd, int *newSockfd, int inetdflag)
 {
   register int tmpSockfd, childpid;
+// fr...@us... changed socklen_t type to int
   //david jencks 1-19-2001 begin
   //  int clilen, on;
 #ifndef socklen_t //problem on ms compiler
-#define socklen_t size_t  //problem on rhlinux 7, socklen_t is uint, size_t is int
+#define socklen_t int  //problem on rhlinux 7, socklen_t is uint, size_t is int
 #endif
   int on;
   socklen_t clilen;

Index: interserver.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/interserver.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- interserver.cpp	2000/08/03 21:07:54	1.1.1.1
+++ interserver.cpp	2001/04/17 12:49:43	1.2
@@ -94,6 +94,16 @@
     fflush (traceStream__);
   }
 }
+//fr...@us... added function
+void debugTraceAPointer (char* where, void* what)
+{
+  if (!traceStream__)
+    traceStream__ = fopen ("debug.log", "w");
+  if (traceStream__) {
+    fprintf (traceStream__, "%s %p\n", where, what);
+    fflush (traceStream__);
+  }
+}
 #endif
 
 // Notice we do not depend on JIBSNet