===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- OpenXM/src/ox_toolkit/ox.c	2000/10/12 15:53:25	1.15
+++ OpenXM/src/ox_toolkit/ox.c	2000/12/05 08:30:25	1.18
@@ -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.17 2000/12/03 16:15:03 ohara Exp $ */
 
 /* 
    This module includes functions for sending/receiveng CMO's.
@@ -19,7 +19,7 @@
 #include "ox_toolkit.h"
 #include "parse.h"
 
-/* CMO_xxx の値の順にならべること(デバッグのため) */
+/* 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 +88,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 +113,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 +225,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;
@@ -388,10 +378,6 @@ 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. */
     }