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

Removed compiler warnings.

Browse source
This commit is contained in:
oliverschmidt 2007-11-17 20:44:07 +00:00
parent 062e2a1ce4
commit 4c6b5b9c17
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/webserver/httpd.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: httpd.c,v 1.5 2007/04/23 21:19:55 oliverschmidt Exp $ * $Id: httpd.c,v 1.6 2007/11/17 20:44:07 oliverschmidt Exp $
*/ */
#include <string.h> #include <string.h>
@ -47,7 +47,7 @@
#define STATE_WAITING 0 #define STATE_WAITING 0
#define STATE_OUTPUT 1 #define STATE_OUTPUT 1
#define SEND_STRING(s, str) PSOCK_SEND(s, str, (unsigned int)strlen(str)) #define SEND_STRING(s, str) PSOCK_SEND(s, (uint8_t *)str, (unsigned int)strlen(str))
MEMB(conns, struct httpd_state, 4); MEMB(conns, struct httpd_state, 4);
#define ISO_nl 0x0a #define ISO_nl 0x0a
@ -93,7 +93,7 @@ PT_THREAD(send_part_of_file(struct httpd_state *s))
{ {
PSOCK_BEGIN(&s->sout); PSOCK_BEGIN(&s->sout);
PSOCK_SEND(&s->sout, s->file.data, s->len); PSOCK_SEND(&s->sout, (uint8_t *)s->file.data, s->len);
PSOCK_END(&s->sout); PSOCK_END(&s->sout);
} }
@ -298,8 +298,8 @@ httpd_appcall(void *state)
return; return;
} }
tcp_markconn(uip_conn, s); tcp_markconn(uip_conn, s);
PSOCK_INIT(&s->sin, s->inputbuf, sizeof(s->inputbuf) - 1); PSOCK_INIT(&s->sin, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1);
PSOCK_INIT(&s->sout, s->inputbuf, sizeof(s->inputbuf) - 1); PSOCK_INIT(&s->sout, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1);
PT_INIT(&s->outputpt); PT_INIT(&s->outputpt);
s->state = STATE_WAITING; s->state = STATE_WAITING;
/* timer_set(&s->timer, CLOCK_SECOND * 100);*/ /* timer_set(&s->timer, CLOCK_SECOND * 100);*/