diff options
author | dos-reis <gdr@axiomatics.org> | 2010-11-28 18:27:48 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-11-28 18:27:48 +0000 |
commit | a53a740a2a1cb6cbfa58cc79caedd4e947ff1ca0 (patch) | |
tree | 457424993ac0beaa92f79d5304570d9c6f88edfc /src/sman/session.c | |
parent | bbb5a69f0f2348adbbb8db960e5e45306b865683 (diff) | |
download | open-axiom-a53a740a2a1cb6cbfa58cc79caedd4e947ff1ca0.tar.gz |
* clef/: Add using directive at toplevel.
* etc/: Likewise.
* graph/: Likewise.
* hyper/: Likewise.
* lib/: Likewise.
* sman/: Likewise.
* Makefile.am (OA_SMAN_TARGETS): New.
(OA_GRAPHICS_TARGETS): Likewise.
Diffstat (limited to 'src/sman/session.c')
-rw-r--r-- | src/sman/session.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/sman/session.c b/src/sman/session.c index 999dc367..2a64dbc2 100644 --- a/src/sman/session.c +++ b/src/sman/session.c @@ -50,6 +50,8 @@ #include "bsdsignal.h" #include "sockio.h" +using namespace OpenAxiom; + static void usr1_handler(int); static void usr2_handler(int); static void term_handler(int); @@ -276,11 +278,11 @@ static void read_from_spad_io(void) { int ret_code; - ret_code = sread(spad_io, oa_buffer_address(big_bad_buf), BufSize, + ret_code = sread(spad_io, byte_address(big_bad_buf), BufSize, "session: stdout socket"); if (ret_code == -1) return; if(active_session != (openaxiom_sio *) 0) { - ret_code = swrite(active_session, oa_buffer_address(big_bad_buf), + ret_code = swrite(active_session, byte_address(big_bad_buf), ret_code, NULL); } } @@ -354,7 +356,7 @@ accept_session_connection(openaxiom_sio *server_sock) active_session = (openaxiom_sio *)plSock; get_string_buf(spad_server, big_bad_buf, BufSize); ret_code = swrite((openaxiom_sio *)plSock, - oa_buffer_address(big_bad_buf), + byte_address(big_bad_buf), strlen(big_bad_buf)+1, "session: writing to InterpWindow"); if (ret_code == -1) @@ -377,14 +379,14 @@ read_from_session(openaxiom_sio *sock) send_int(spad_server, sock->frame); } active_session = sock; - ret_code = sread(sock, oa_buffer_address(big_bad_buf), BufSize, + ret_code = sread(sock, byte_address(big_bad_buf), BufSize, "session: reading InterpWindow"); if (ret_code == -1) { active_session = (openaxiom_sio *) 0; reading_output = 0; return; } - ret_code = swrite(spad_io, oa_buffer_address(big_bad_buf), ret_code, + ret_code = swrite(spad_io, byte_address(big_bad_buf), ret_code, "session: writing SessionIO"); if (ret_code == -1) { active_session = (openaxiom_sio *)0 ; |