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-18 00:57:44 +00:00
parent 6d6edb418b
commit 84272a3dcb
4 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/email/email.c
View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment for the C64. * This file is part of the Contiki desktop environment for the C64.
* *
* $Id: email.c,v 1.2 2007/09/29 04:12:15 matsutsuka Exp $ * $Id: email.c,v 1.3 2007/11/18 00:57:44 oliverschmidt Exp $
* *
*/ */
@ -128,24 +128,29 @@ static char smtpserver[40];
static struct ctk_textentry smtpservertextentry = static struct ctk_textentry smtpservertextentry =
{CTK_TEXTENTRY(0, 4, 26, 1, smtpserver, 39)}; {CTK_TEXTENTRY(0, 4, 26, 1, smtpserver, 39)};
/*
static struct ctk_label pop3serverlabel = static struct ctk_label pop3serverlabel =
{CTK_LABEL(0, 6, 20, 1, "Incoming mailserver")}; {CTK_LABEL(0, 6, 20, 1, "Incoming mailserver")};
static char pop3server[40]; static char pop3server[40];
static struct ctk_textentry pop3servertextentry = static struct ctk_textentry pop3servertextentry =
{CTK_TEXTENTRY(0, 7, 26, 1, pop3server, 39)}; {CTK_TEXTENTRY(0, 7, 26, 1, pop3server, 39)};
*/
/*
static struct ctk_label pop3userlabel = static struct ctk_label pop3userlabel =
{CTK_LABEL(0, 9, 20, 1, "Mailserver username")}; {CTK_LABEL(0, 9, 20, 1, "Mailserver username")};
static char pop3user[40]; static char pop3user[40];
static struct ctk_textentry pop3usertextentry = static struct ctk_textentry pop3usertextentry =
{CTK_TEXTENTRY(0, 10, 26, 1, pop3user, 39)}; {CTK_TEXTENTRY(0, 10, 26, 1, pop3user, 39)};
*/
/*
static struct ctk_label pop3passwordlabel = static struct ctk_label pop3passwordlabel =
{CTK_LABEL(0, 12, 20, 1, "Mailserver password")}; {CTK_LABEL(0, 12, 20, 1, "Mailserver password")};
static char pop3password[40]; static char pop3password[40];
static struct ctk_textentry pop3passwordtextentry = static struct ctk_textentry pop3passwordtextentry =
{CTK_TEXTENTRY(0, 13, 26, 1, pop3password, 39)}; {CTK_TEXTENTRY(0, 13, 26, 1, pop3password, 39)};
*/
static struct ctk_button setupokbutton = static struct ctk_button setupokbutton =
{CTK_BUTTON(24, 15, 2, "Ok")}; {CTK_BUTTON(24, 15, 2, "Ok")};

6
apps/email/smtp-socket.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: smtp-socket.c,v 1.2 2006/08/21 21:32:24 oliverschmidt Exp $ * $Id: smtp-socket.c,v 1.3 2007/11/18 01:00:50 oliverschmidt Exp $
*/ */
#include "smtp.h" #include "smtp.h"
@ -73,7 +73,7 @@ static u16_t smtpserver[2];
#define ISO_5 0x35 #define ISO_5 0x35
#define SEND_STRING(s, str) PSOCK_SEND(s, str, (unsigned char)strlen(str)) #define SEND_STRING(s, str) PSOCK_SEND(s, (uint8_t *)str, (unsigned char)strlen(str))
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static
PT_THREAD(smtp_thread(void)) PT_THREAD(smtp_thread(void))
@ -227,7 +227,7 @@ smtp_send(char *to, char *cc, char *from, char *subject,
s.msgwidth = msgwidth; s.msgwidth = msgwidth;
s.msgheight = msgheight; s.msgheight = msgheight;
PSOCK_INIT(&s.psock, s.inputbuffer, sizeof(s.inputbuffer)); PSOCK_INIT(&s.psock, (uint8_t *)s.inputbuffer, sizeof(s.inputbuffer));
return 1; return 1;
} }

15
apps/ftp/ftp.c
View file

@ -30,18 +30,19 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: ftp.c,v 1.3 2007/09/29 04:12:15 matsutsuka Exp $ * $Id: ftp.c,v 1.4 2007/11/18 01:05:10 oliverschmidt Exp $
*/ */
/* Note to self: It would be nice to have a "View" option in the download dialog. */ /* Note to self: It would be nice to have a "View" option in the download dialog. */
#include <string.h>
#include <stddef.h>
#include "ftpc.h" #include "ftpc.h"
#include "contiki.h" #include "contiki.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "net/resolv.h" #include "net/resolv.h"
#include <string.h>
#define MAX_USERNAMELEN 16 #define MAX_USERNAMELEN 16
#define MAX_PASSWORDLEN 16 #define MAX_PASSWORDLEN 16
#define MAX_HOSTNAMELEN 32 #define MAX_HOSTNAMELEN 32
@ -451,7 +452,7 @@ PROCESS_THREAD(ftp_process, ev, data)
} else { } else {
ptrstate = PTRSTATE_LOCALFILES; ptrstate = PTRSTATE_LOCALFILES;
} }
} else */ if((ctk_arch_key_t)data == CH_CURS_UP) { } else */ if((ctk_arch_key_t)(size_t)data == CH_CURS_UP) {
clearptr(); clearptr();
if(ptrstate == PTRSTATE_LOCALFILES) { if(ptrstate == PTRSTATE_LOCALFILES) {
if(localptr > 0) { if(localptr > 0) {
@ -462,7 +463,7 @@ PROCESS_THREAD(ftp_process, ev, data)
--remoteptr; --remoteptr;
} }
} }
} else if((ctk_arch_key_t)data == CH_CURS_DOWN) { } else if((ctk_arch_key_t)(size_t)data == CH_CURS_DOWN) {
clearptr(); clearptr();
if(ptrstate == PTRSTATE_LOCALFILES) { if(ptrstate == PTRSTATE_LOCALFILES) {
if(localptr < FILES_HEIGHT - 1) { if(localptr < FILES_HEIGHT - 1) {
@ -473,7 +474,7 @@ PROCESS_THREAD(ftp_process, ev, data)
++remoteptr; ++remoteptr;
} }
} }
} else if((ctk_arch_key_t)data == CH_ENTER) { } else if((ctk_arch_key_t)(size_t)data == CH_ENTER) {
if(ptrstate == PTRSTATE_LOCALFILES) { if(ptrstate == PTRSTATE_LOCALFILES) {
strncpy(localfilename, strncpy(localfilename,
&localfiles[localptr * FILES_WIDTH], FILES_WIDTH); &localfiles[localptr * FILES_WIDTH], FILES_WIDTH);
@ -490,7 +491,7 @@ PROCESS_THREAD(ftp_process, ev, data)
/* make_downloaddialog(); /* make_downloaddialog();
ctk_dialog_open(&dialog);*/ ctk_dialog_open(&dialog);*/
} }
} else if((ctk_arch_key_t)data == 'u') { } else if((ctk_arch_key_t)(size_t)data == 'u') {
ftpc_cdup(connection); ftpc_cdup(connection);
} }

6
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.2 2006/08/21 21:39:49 oliverschmidt Exp $ * $Id: ircc.c,v 1.3 2007/11/18 01:09:00 oliverschmidt Exp $
*/ */
#include "contiki.h" #include "contiki.h"
@ -50,7 +50,7 @@
#define PORT 6667 #define PORT 6667
#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))
#define ISO_space 0x20 #define ISO_space 0x20
#define ISO_bang 0x21 #define ISO_bang 0x21
@ -412,7 +412,7 @@ PT_THREAD(handle_connection(struct ircc_state *s))
{ {
PT_BEGIN(&s->pt); PT_BEGIN(&s->pt);
PSOCK_INIT(&s->s, s->inputbuf, sizeof(s->inputbuf) - 1); PSOCK_INIT(&s->s, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1);
PT_WAIT_THREAD(&s->pt, setup_connection(s)); PT_WAIT_THREAD(&s->pt, setup_connection(s));