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

Added check for NULL textentry input, and a typecast to make cc65 happy

Browse source
This commit is contained in:
adamdunkels 2009-02-25 10:34:47 +00:00
parent d761dfebd1
commit 54fd65be5b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/ctk/ctk.c
View file

@ -44,7 +44,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: ctk.c,v 1.21 2009/02/25 09:13:51 adamdunkels Exp $ * $Id: ctk.c,v 1.22 2009/02/25 10:34:47 adamdunkels Exp $
* *
*/ */
@ -1180,7 +1180,9 @@ textentry_input(ctk_arch_key_t c, CC_REGISTER_ARG struct ctk_textentry *t)
register char *cptr, *cptr2; register char *cptr, *cptr2;
static unsigned char len, txpos, typos, tlen; static unsigned char len, txpos, typos, tlen;
if(t->input != ctk_textentry_input_null && t->input(c, t)) { if(t->input != NULL &&
t->input != (ctk_textentry_input)ctk_textentry_input_null &&
t->input(c, t)) {
return; return;
} }