===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.15
retrieving revision 1.21
diff -u -p -r1.15 -r1.21
--- OpenXM/src/ox_toolkit/ox.c	2000/10/12 15:53:25	1.15
+++ 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.14 2000/10/11 06:56:02 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,7 +20,9 @@
 #include "ox_toolkit.h"
 #include "parse.h"
 
-/* CMO_xxx の値の順にならべること(デバッグのため) */
+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);
 static cmo_string*       receive_cmo_string(OXFILE *oxfp);
@@ -88,19 +91,12 @@ cmo_error2* make_error_object(int err_code, cmo *ob)
     list_append(li, (cmo *)new_cmo_int32(current_received_serial));
     list_append(li, (cmo *)new_cmo_int32(err_code));
     list_append(li, ob);
-    /* 他の情報を加えるならココ */
     return new_cmo_error2((cmo *)li);
 }
 
-#define DEFAULT_SERIAL_NUMBER 0x0000ffff
-#define receive_serial_number(x)   (receive_int32((x)))
-
 /* getting a next serial number. */
 int next_serial(OXFILE *oxfp)
 {
-/*
-    static int serial_number = DEFAULT_SERIAL_NUMBER;
-*/
     return oxfp->serial_number++;
 }
 
@@ -120,7 +116,7 @@ int receive_int32(OXFILE *oxfp)
 int receive_ox_tag(OXFILE *oxfp)
 {
     int tag = receive_int32(oxfp);
-    current_received_serial = receive_serial_number(oxfp);
+    oxfp->received_serial_number = receive_int32(oxfp);
     return tag;
 }
 
@@ -232,10 +228,7 @@ static cmo_error2* receive_cmo_error2(OXFILE *oxfp)
     return new_cmo_error2(ob);
 }
 
-/* receive_ox_tag() == OX_DATA の後に呼び出される */
-/* 関数ポインタを使った方がきれいに書けるような気がする.  */
-/* if (foo[tag] != NULL) foo[tag](oxfp); とか */
-
+/* receive_cmo() is called after receive_ox_tag(). */
 cmo* receive_cmo(OXFILE *oxfp)
 {
     cmo* m;
@@ -281,7 +274,7 @@ cmo* receive_cmo(OXFILE *oxfp)
     case CMO_QQ:
     default:
         m = NULL;
-        fprintf(stderr, "the CMO (%d) is not implemented.\n", tag);
+        ox_printf("the CMO (%d) is not implemented.\n", tag);
     }
     return m;
 }
@@ -308,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(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)
@@ -388,18 +379,12 @@ int ox_flush(OXFILE *sv)
 void ox_reset(OXFILE *sv)
 {
     send_ox_command(oxf_control(sv), SM_control_reset_connection);
-
-    receive_ox_tag(oxf_control(sv));      /* OX_DATA */
-    receive_cmo(oxf_control(sv));         /* (CMO_INT32, 0) */
-
     while(receive_ox_tag(sv) != OX_SYNC_BALL) {
         receive_cmo(sv); /* skipping a message. */
     }
 
     send_ox_tag(sv, OX_SYNC_BALL);
-#ifdef DEBUG
-    fprintf(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)
@@ -576,4 +561,21 @@ ox_sync_ball* new_ox_sync_ball()
     ox_sync_ball *m = malloc(sizeof(ox_sync_ball));
     m->tag = OX_SYNC_BALL;
     return m;
+}
+
+int ox_stderr_init(FILE *fp)
+{
+    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);
+    }
 }