=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v retrieving revision 1.17 retrieving revision 1.19 diff -u -p -r1.17 -r1.19 --- OpenXM/src/ox_toolkit/ox.c 2000/12/03 16:15:03 1.17 +++ OpenXM/src/ox_toolkit/ox.c 2003/01/11 11:42:31 1.19 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.16 2000/11/28 22:11:13 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.18 2000/12/05 08:30:25 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. @@ -271,7 +271,7 @@ cmo* receive_cmo(OXFILE *oxfp) case CMO_QQ: default: m = NULL; - fprintf(stderr, "the CMO (%d) is not implemented.\n", tag); + fprintf(ox_stderr, "the CMO (%d) is not implemented.\n", tag); } return m; } @@ -301,7 +301,7 @@ void ox_close(OXFILE *sv) #ifdef DEBUG sleep(2); /* We wait thar an OpenXM server terminates. */ - fprintf(stderr, "I have closed the connection to an Open XM server.\n"); + fprintf(ox_stderr, "I have closed the connection to an Open XM server.\n"); #endif } @@ -378,17 +378,13 @@ 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"); + fprintf(ox_stderr, "I have reset an Open XM server.\n"); #endif } @@ -566,4 +562,10 @@ 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 != NULL)? fp: (stderr); + setbuf(ox_stderr, NULL); }