From 4757ae2fe0c6d43b17c2f0ac9c61fc5042b4870e Mon Sep 17 00:00:00 2001 From: Quinn Evans Date: Sun, 27 Sep 2015 15:17:56 -0600 Subject: [PATCH] Finish removing return values; actually works now. --- WOPO.COB | 8 ++++---- channel.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/WOPO.COB b/WOPO.COB index 5d21a11..95ea156 100644 --- a/WOPO.COB +++ b/WOPO.COB @@ -63,7 +63,7 @@ CALL "PRINT-CONFIG". MOVE LENGTH OF MSG-BODY TO MSG-LENGTH. CALL "CHANNEL-INIT" - USING BUFFER. + USING BUFFER, STATE. OPEN INPUT CONFIG. MOVE "SERVER" TO CONFIG-KEY. PERFORM READ-CONFIG-ENTRY. @@ -72,7 +72,7 @@ CONFIG-VALUE, DELIMITED BY SPACE, INTO MSG-BODY, WITH POINTER MSG-LENGTH. - CALL "CHANNEL-OPEN", GIVING STATE. + CALL "CHANNEL-OPEN". IF NOT SUCCESS THEN DISPLAY MSG-BODY GO TO DIE. MOVE "PASS" TO CONFIG-KEY. @@ -146,13 +146,13 @@ GO TO DIE. SEND-LINE. - CALL "CHANNEL-SEND" GIVING STATE. + CALL "CHANNEL-SEND". IF NOT SUCCESS THEN DISPLAY MSG-BODY GO TO DIE. RECEIVE-LINE. INITIALIZE MSG-BODY. - CALL "CHANNEL-RECV" GIVING STATE. + CALL "CHANNEL-RECV". IF NOT SUCCESS THEN GO TO DIE. CALL "IRC-MSG" USING BUFFER, IRC-MESSAGE. diff --git a/channel.c b/channel.c index e9834a9..08eb5a7 100644 --- a/channel.c +++ b/channel.c @@ -42,7 +42,7 @@ int channel_message_length(void) void channel_set_status(int value) { char buf[9]; - sprintf(buf, "%8u", value); + sprintf(buf, "%08u", value); memcpy(channel_status, buf + 6, 2); return; @@ -169,13 +169,13 @@ void CHANNEL__SEND(void) perror("send"); close(sockfd); channel_string_to_cobol("Hung up"); - set_channel_status(EHUP); + channel_set_status(EHUP); return; } sent += status; } - set_channel_status(0); + channel_set_status(0); return; } @@ -189,7 +189,7 @@ void CHANNEL__RECV(void) size_t message_size = message_end - recv_buf; if (message_size > msg_body_len) { channel_string_to_cobol("Server sent too-long message"); - set_channel_status(ESERV); + channel_set_status(ESERV); return; } memcpy(msg_body, recv_buf, message_size); @@ -200,7 +200,7 @@ void CHANNEL__RECV(void) recv_buf[i] = message_end[i]; } channel_to_cobol(); - set_channel_status(0); + channel_set_status(0); return; } if(recv_buf_pos < RECV_BUF_SIZE - 1) { @@ -211,12 +211,12 @@ void CHANNEL__RECV(void) } perror("recv"); channel_string_to_cobol("Hung up"); - set_channel_status(EHUP); + channel_set_status(EHUP); return; } channel_string_to_cobol("Server failed to send newline"); - set_channel_status(ESERV); + channel_set_status(ESERV); return; }