mturk 2004/12/07 06:49:07
Modified: jk/native/common jk_msg_buff.c
Log:
Remove all stderr error messages. We are using logger for those.
Revision Changes Path
1.26 +3 -49 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_msg_buff.c 7 Dec 2004 04:37:09 -0000 1.25
+++ jk_msg_buff.c 7 Dec 2004 14:49:07 -0000 1.26
@@ -45,36 +45,6 @@
* Simple marshaling code.
*/
-/* Deprecated: We need smarter way for that.
- Do not use stderr for logging
- */
-#if defined(DEBUG) || defined(_DEBUG)
-static void jk_b_dump(jk_msg_buf_t *msg, char *err)
-{
- int i = 0;
- fprintf(stderr,
- "%s %d/%d/%d %x %x %x %x - %x %x %x %x - %x %x %x %x - %x %x %x
%x\n",
- err, msg->pos, msg->len, msg->maxlen,
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++],
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++],
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++],
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++]);
-
- i = msg->pos - 4;
- if (i < 0) {
- i = 0;
- }
-
- fprintf(stderr,
- " %x %x %x %x - %x %x %x %x --- %x %x %x %x - %x %x %x
%x\n",
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++],
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++],
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++],
- msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++]);
-
-}
-#endif
-
void jk_b_reset(jk_msg_buf_t *msg)
{
msg->len = 4;
@@ -282,9 +252,6 @@
{
unsigned long i;
if (msg->pos + 3 > msg->len) {
-#if defined(DEBUG) || defined(_DEBUG)
- fprintf(stderr, "jk_b_get_long::Read after end \n");
-#endif
return 0xFFFFFFFF;
}
i = ((msg->buf[(msg->pos++)] & 0xFF) << 24);
@@ -309,9 +276,6 @@
{
unsigned short i;
if (msg->pos + 1 > msg->len) {
-#if defined(DEBUG) || defined(_DEBUG)
- fprintf(stderr, "jk_b_get_int::Read after end \n");
-#endif
return 0xFFFF;
}
i = ((msg->buf[(msg->pos++)] & 0xFF) << 8);
@@ -331,9 +295,6 @@
{
unsigned char rc;
if (msg->pos > msg->len) {
-#if defined(DEBUG) || defined(_DEBUG)
- fprintf(stderr, "jk_b_get_byte::Read after end \n");
-#endif
return 0xFF;
}
rc = msg->buf[msg->pos++];
@@ -353,11 +314,8 @@
int start = msg->pos;
if ((size == 0xFFFF) || (size + start > msg->maxlen)) {
-#if defined (DEBUG) || (_DEBUG)
- jk_b_dump(msg, "After get int");
- fprintf(stderr, "ERROR\n");
-#endif
- return (unsigned char *)"ERROR"; /* XXX */
+ /* TODO: return NULL and deal with that in the code */
+ return (unsigned char *)"ERROR";
}
msg->pos += size;
@@ -371,10 +329,6 @@
int start = msg->pos;
if ((len < 0) || (len + start > msg->maxlen)) {
-#if defined (DEBUG) || (_DEBUG)
- jk_b_dump(msg, "After get bytes");
- fprintf(stderr, "ERROR\n");
-#endif
return (-1);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
