Finish removing return values; actually works now.

This commit is contained in:
Quinn Evans 2015-09-27 15:17:56 -06:00
parent b57a27e08b
commit 4757ae2fe0
2 changed files with 11 additions and 11 deletions

View File

@ -63,7 +63,7 @@
CALL "PRINT-CONFIG". CALL "PRINT-CONFIG".
MOVE LENGTH OF MSG-BODY TO MSG-LENGTH. MOVE LENGTH OF MSG-BODY TO MSG-LENGTH.
CALL "CHANNEL-INIT" CALL "CHANNEL-INIT"
USING BUFFER. USING BUFFER, STATE.
OPEN INPUT CONFIG. OPEN INPUT CONFIG.
MOVE "SERVER" TO CONFIG-KEY. MOVE "SERVER" TO CONFIG-KEY.
PERFORM READ-CONFIG-ENTRY. PERFORM READ-CONFIG-ENTRY.
@ -72,7 +72,7 @@
CONFIG-VALUE, DELIMITED BY SPACE, CONFIG-VALUE, DELIMITED BY SPACE,
INTO MSG-BODY, INTO MSG-BODY,
WITH POINTER MSG-LENGTH. WITH POINTER MSG-LENGTH.
CALL "CHANNEL-OPEN", GIVING STATE. CALL "CHANNEL-OPEN".
IF NOT SUCCESS THEN DISPLAY MSG-BODY IF NOT SUCCESS THEN DISPLAY MSG-BODY
GO TO DIE. GO TO DIE.
MOVE "PASS" TO CONFIG-KEY. MOVE "PASS" TO CONFIG-KEY.
@ -146,13 +146,13 @@
GO TO DIE. GO TO DIE.
SEND-LINE. SEND-LINE.
CALL "CHANNEL-SEND" GIVING STATE. CALL "CHANNEL-SEND".
IF NOT SUCCESS THEN DISPLAY MSG-BODY IF NOT SUCCESS THEN DISPLAY MSG-BODY
GO TO DIE. GO TO DIE.
RECEIVE-LINE. RECEIVE-LINE.
INITIALIZE MSG-BODY. INITIALIZE MSG-BODY.
CALL "CHANNEL-RECV" GIVING STATE. CALL "CHANNEL-RECV".
IF NOT SUCCESS THEN GO TO DIE. IF NOT SUCCESS THEN GO TO DIE.
CALL "IRC-MSG" USING BUFFER, IRC-MESSAGE. CALL "IRC-MSG" USING BUFFER, IRC-MESSAGE.

View File

@ -42,7 +42,7 @@ int channel_message_length(void)
void channel_set_status(int value) void channel_set_status(int value)
{ {
char buf[9]; char buf[9];
sprintf(buf, "%8u", value); sprintf(buf, "%08u", value);
memcpy(channel_status, buf + 6, 2); memcpy(channel_status, buf + 6, 2);
return; return;
@ -169,13 +169,13 @@ void CHANNEL__SEND(void)
perror("send"); perror("send");
close(sockfd); close(sockfd);
channel_string_to_cobol("Hung up"); channel_string_to_cobol("Hung up");
set_channel_status(EHUP); channel_set_status(EHUP);
return; return;
} }
sent += status; sent += status;
} }
set_channel_status(0); channel_set_status(0);
return; return;
} }
@ -189,7 +189,7 @@ void CHANNEL__RECV(void)
size_t message_size = message_end - recv_buf; size_t message_size = message_end - recv_buf;
if (message_size > msg_body_len) { if (message_size > msg_body_len) {
channel_string_to_cobol("Server sent too-long message"); channel_string_to_cobol("Server sent too-long message");
set_channel_status(ESERV); channel_set_status(ESERV);
return; return;
} }
memcpy(msg_body, recv_buf, message_size); memcpy(msg_body, recv_buf, message_size);
@ -200,7 +200,7 @@ void CHANNEL__RECV(void)
recv_buf[i] = message_end[i]; recv_buf[i] = message_end[i];
} }
channel_to_cobol(); channel_to_cobol();
set_channel_status(0); channel_set_status(0);
return; return;
} }
if(recv_buf_pos < RECV_BUF_SIZE - 1) { if(recv_buf_pos < RECV_BUF_SIZE - 1) {
@ -211,12 +211,12 @@ void CHANNEL__RECV(void)
} }
perror("recv"); perror("recv");
channel_string_to_cobol("Hung up"); channel_string_to_cobol("Hung up");
set_channel_status(EHUP); channel_set_status(EHUP);
return; return;
} }
channel_string_to_cobol("Server failed to send newline"); channel_string_to_cobol("Server failed to send newline");
set_channel_status(ESERV); channel_set_status(ESERV);
return; return;
} }