Skip to content

Commit de81907

Browse files
committed
Zap useless and even harmful CommandSent state
1 parent c33d1af commit de81907

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

chat.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ proceed_user_input(char *line) {
197197
prefer_long_priv_cmd = cmd.cmd_name_len == 3;
198198
}
199199
push_icb_msg('h', line + 1, strlen(line) - 1);
200-
state = CommandSent;
201200
return;
202201
}
203202

@@ -422,9 +421,7 @@ proceed_icb_msg(char *msg, size_t len) {
422421
case 'f': // important message
423422
{
424423
char *text;
425-
if (state == CommandSent)
426-
state = Chat;
427-
else if (state != Chat)
424+
if (state != Chat)
428425
err_unexpected_msg(type);
429426
if ((text = strchr(msg, '\001')) == NULL)
430427
err_invalid_msg(type, "missing text");
@@ -434,7 +431,7 @@ proceed_icb_msg(char *msg, size_t len) {
434431
}
435432

436433
case 'e': // error
437-
if (state != Chat && state != CommandSent)
434+
if (state != Chat)
438435
want_exit = 1;
439436
if (strcmp(msg, "Undefined message type 108") == 0) {
440437
/* server doesn't support ping-pong */
@@ -461,7 +458,7 @@ proceed_icb_msg(char *msg, size_t len) {
461458
int i;
462459
char *outtype;
463460

464-
if (state != CommandSent)
461+
if (state != Chat)
465462
err_unexpected_msg(type);
466463
outtype = msg;
467464
if ((msg = strchr(msg, '\001')) == NULL)
@@ -507,7 +504,7 @@ proceed_icb_msg(char *msg, size_t len) {
507504
}
508505

509506
case 'k': // beep
510-
if (state != Chat && state != CommandSent)
507+
if (state != Chat)
511508
err_unexpected_msg(type);
512509
proceed_chat_msg(type, "SERVER", "\007BEEP!");
513510
break;

oicb.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ enum ICBState {
3030
Connected,
3131
LoginSent,
3232
Chat,
33-
CommandSent,
3433
};
3534
extern enum ICBState state;
3635

0 commit comments

Comments
 (0)