deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: rewrote the switch() statement into an if/else sequence. Protothreads and switches do not mix well.

Browse source
This commit is contained in:
adamdunkels 2008-11-28 00:15:43 +00:00
parent 3713d1fcf9
commit abe482713b
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/irc/ircc.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: ircc.c,v 1.3 2007/11/18 01:09:00 oliverschmidt Exp $ * $Id: ircc.c,v 1.4 2008/11/28 00:15:43 adamdunkels Exp $
*/ */
#include "contiki.h" #include "contiki.h"
@ -424,36 +424,27 @@ PT_THREAD(handle_connection(struct ircc_state *s))
PT_WAIT_THREAD(&s->pt, handle_input(s)); PT_WAIT_THREAD(&s->pt, handle_input(s));
} }
switch(s->command) { if(s->command == COMMAND_JOIN) {
case COMMAND_JOIN:
s->command = COMMAND_NONE; s->command = COMMAND_NONE;
PT_WAIT_THREAD(&s->pt, join_channel(s)); PT_WAIT_THREAD(&s->pt, join_channel(s));
break; } else if(s->command == COMMAND_PART) {
case COMMAND_PART:
s->command = COMMAND_NONE; s->command = COMMAND_NONE;
PT_WAIT_THREAD(&s->pt, part_channel(s)); PT_WAIT_THREAD(&s->pt, part_channel(s));
break; } else if(s->command == COMMAND_MSG) {
case COMMAND_MSG:
s->command = COMMAND_NONE; s->command = COMMAND_NONE;
PT_WAIT_THREAD(&s->pt, send_message(s)); PT_WAIT_THREAD(&s->pt, send_message(s));
break; } else if(s->command == COMMAND_ACTIONMSG) {
case COMMAND_ACTIONMSG:
s->command = COMMAND_NONE; s->command = COMMAND_NONE;
PT_WAIT_THREAD(&s->pt, send_actionmessage(s)); PT_WAIT_THREAD(&s->pt, send_actionmessage(s));
break; } else if(s->command == COMMAND_LIST) {
case COMMAND_LIST:
s->command = COMMAND_NONE; s->command = COMMAND_NONE;
PT_WAIT_THREAD(&s->pt, list_channel(s)); PT_WAIT_THREAD(&s->pt, list_channel(s));
break; } else if(s->command == COMMAND_QUIT) {
case COMMAND_QUIT:
s->command = COMMAND_NONE; s->command = COMMAND_NONE;
tcp_markconn(uip_conn, NULL); tcp_markconn(uip_conn, NULL);
PSOCK_CLOSE(&s->s); PSOCK_CLOSE(&s->s);
process_post(PROCESS_CURRENT(), PROCESS_EVENT_EXIT, NULL); process_post(PROCESS_CURRENT(), PROCESS_EVENT_EXIT, NULL);
PT_EXIT(&s->pt); PT_EXIT(&s->pt);
break;
default:
break;
} }
} }
@ -478,7 +469,7 @@ ircc_appcall(void *s)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
struct ircc_state * struct ircc_state *
ircc_connect(struct ircc_state *s, char *servername, u16_t *ipaddr, ircc_connect(struct ircc_state *s, char *servername, uip_ipaddr_t *ipaddr,
char *nick) char *nick)
{ {
s->conn = tcp_connect((uip_ipaddr_t *)ipaddr, HTONS(PORT), s); s->conn = tcp_connect((uip_ipaddr_t *)ipaddr, HTONS(PORT), s);