hgomez 01/05/15 03:23:08
Modified: jk/src/native/common jk_sockbuf.c jk_util.c
Log:
Fix the problem with C++ comment in C code.
Make at least 2 systems failed, my AS/400 V4R5 and
some boxes owned by Jean-Frederic Clere who pointed that one
Revision Changes Path
1.2 +2 -2 jakarta-tomcat-connectors/jk/src/native/common/jk_sockbuf.c
Index: jk_sockbuf.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_sockbuf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_sockbuf.c 2001/05/14 09:41:31 1.1
+++ jk_sockbuf.c 2001/05/15 10:23:01 1.2
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Simple buffer object to handle buffered socket IO *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#include "jk_global.h"
@@ -224,7 +224,7 @@
sb->buf + sb->end,
SOCKBUF_SIZE - sb->end, 0);
- // 0 is EOF/SHUTDOWN, -1 is SOCK_ERROR
+ /* 0 is EOF/SHUTDOWN, -1 is SOCK_ERROR */
if (ret <= 0) {
return ret;
}
1.2 +3 -3 jakarta-tomcat-connectors/jk/src/native/common/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_util.c 2001/05/14 09:42:23 1.1
+++ jk_util.c 2001/05/15 10:23:03 1.2
@@ -57,7 +57,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
@@ -232,7 +232,7 @@
set_time_str(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f, line);
-#elif defined(NETWARE) // until we get a snprintf function
+#elif defined(NETWARE) /* until we get a snprintf function */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
return -1;
@@ -252,7 +252,7 @@
va_start(args, fmt);
#ifdef WIN32
rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
-#elif defined(NETWARE) // until we get a vsnprintf function
+#elif defined(NETWARE) /* until we get a vsnprintf function */
rc = vsprintf(buf + used, fmt, args);
#else
rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
