===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.19
retrieving revision 1.21
diff -u -p -r1.19 -r1.21
--- OpenXM/src/ox_toolkit/ox.c	2003/01/11 11:42:31	1.19
+++ OpenXM/src/ox_toolkit/ox.c	2003/02/04 20:43:55	1.21
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.18 2000/12/05 08:30:25 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.20 2003/01/13 12:03:12 ohara Exp $ */
 
 /* 
    This module includes functions for sending/receiveng CMO's.
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -19,6 +20,8 @@
 #include "ox_toolkit.h"
 #include "parse.h"
 
+static FILE *ox_stderr = NULL;
+
 /* sorting by the value of CMO_xxx.  (for debugging) */
 static cmo_null*         receive_cmo_null(OXFILE *oxfp);
 static cmo_int32*        receive_cmo_int32(OXFILE *oxfp);
@@ -271,7 +274,7 @@ cmo* receive_cmo(OXFILE *oxfp)
     case CMO_QQ:
     default:
         m = NULL;
-        fprintf(ox_stderr, "the CMO (%d) is not implemented.\n", tag);
+        ox_printf("the CMO (%d) is not implemented.\n", tag);
     }
     return m;
 }
@@ -298,11 +301,9 @@ void send_ox_command(OXFILE *oxfp, int sm_command)
 void ox_close(OXFILE *sv)
 {
     send_ox_command(oxf_control(sv), SM_control_kill);
-#ifdef DEBUG
     sleep(2);
     /* We wait thar an OpenXM server terminates. */
-    fprintf(ox_stderr, "I have closed the connection to an Open XM server.\n");
-#endif
+    ox_printf("I have closed the connection to an Open XM server.\n");
 }
 
 void ox_shutdown(OXFILE *sv)
@@ -383,9 +384,7 @@ void ox_reset(OXFILE *sv)
     }
 
     send_ox_tag(sv, OX_SYNC_BALL);
-#ifdef DEBUG
-    fprintf(ox_stderr, "I have reset an Open XM server.\n");
-#endif
+    ox_printf("I have reset an Open XM server.\n");
 }
 
 void send_ox(OXFILE *oxfp, ox *m)
@@ -566,6 +565,17 @@ ox_sync_ball* new_ox_sync_ball()
 
 int ox_stderr_init(FILE *fp)
 {
-    ox_stderr = (fp != NULL)? fp: (stderr);
-    setbuf(ox_stderr, NULL);
+    ox_stderr = fp;
+    if (ox_stderr != NULL) {
+        setbuf(ox_stderr, NULL);
+    }
+}
+
+int ox_printf(char *format, ...)
+{
+    if (ox_stderr != NULL) {
+        va_list ap;
+        va_start(ap, format);
+        vfprintf(ox_stderr, format, ap);
+    }
 }