diff options
author | Michiel Van Der Kolk <not.valid@email.address> | 2005-04-29 23:57:50 +0000 |
---|---|---|
committer | Michiel Van Der Kolk <not.valid@email.address> | 2005-04-29 23:57:50 +0000 |
commit | a9e4555b6ffe880b973640bdb0214fbc2705219a (patch) | |
tree | 412a80e5df5e3f7ecdb41b11f964023ae5b27bc6 /apps/plugins/searchengine/token.c | |
parent | fe708f22d53bdca14e9048a6815fa30b31ddfba7 (diff) | |
download | rockbox-a9e4555b6ffe880b973640bdb0214fbc2705219a.tar.gz rockbox-a9e4555b6ffe880b973640bdb0214fbc2705219a.zip |
Better error messenging. less crashes. good.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6389 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/searchengine/token.c')
-rw-r--r-- | apps/plugins/searchengine/token.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/apps/plugins/searchengine/token.c b/apps/plugins/searchengine/token.c index a98fae4540..fa1f84eb7d 100644 --- a/apps/plugins/searchengine/token.c +++ b/apps/plugins/searchengine/token.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "dbinterface.h" | 21 | #include "dbinterface.h" |
22 | 22 | ||
23 | char *getstring(struct token *token) { | 23 | char *getstring(struct token *token) { |
24 | char buf[200]; | ||
24 | switch(token->kind) { | 25 | switch(token->kind) { |
25 | case TOKEN_STRING: | 26 | case TOKEN_STRING: |
26 | return token->spelling; | 27 | return token->spelling; |
@@ -41,18 +42,21 @@ char *getstring(struct token *token) { | |||
41 | case INTVALUE_FILENAME: | 42 | case INTVALUE_FILENAME: |
42 | return currententry->filename; | 43 | return currententry->filename; |
43 | default: | 44 | default: |
44 | rb->splash(HZ*2,true,"unknown stringid intvalue"); | 45 | rb->snprintf(buf,199,"unknown stringid intvalue %d",token->intvalue); |
45 | return 0; | 46 | rb->splash(HZ*2,true,buf); |
47 | return ""; | ||
46 | } | 48 | } |
47 | break; | 49 | break; |
48 | default: | 50 | default: |
49 | // report error | 51 | // report error |
50 | rb->splash(HZ*2,true,"unknown token..."); | 52 | rb->snprintf(buf,199,"unknown token %d in getstring..",token->kind); |
51 | return 0; | 53 | rb->splash(HZ*2,true,buf); |
54 | return ""; | ||
52 | } | 55 | } |
53 | } | 56 | } |
54 | 57 | ||
55 | int getvalue(struct token *token) { | 58 | int getvalue(struct token *token) { |
59 | char buf[200]; | ||
56 | switch(token->kind) { | 60 | switch(token->kind) { |
57 | case TOKEN_NUM: | 61 | case TOKEN_NUM: |
58 | return token->intvalue; | 62 | return token->intvalue; |
@@ -68,12 +72,14 @@ int getvalue(struct token *token) { | |||
68 | loadrundbdata(); | 72 | loadrundbdata(); |
69 | return currententry->playcount; | 73 | return currententry->playcount; |
70 | default: | 74 | default: |
71 | rb->splash(HZ*2,true,"unknown numid intvalue"); | 75 | rb->snprintf(buf,199,"unknown numid intvalue %d",token->intvalue); |
76 | rb->splash(HZ*2,true,buf); | ||
72 | // report error. | 77 | // report error. |
73 | return 0; | 78 | return 0; |
74 | } | 79 | } |
75 | default: | 80 | default: |
76 | rb->splash(HZ*2,true,"unknown token..."); | 81 | rb->snprintf(buf,199,"unknown token %d in getvalue..",token->kind); |
82 | rb->splash(HZ*2,true,buf); | ||
77 | return 0; | 83 | return 0; |
78 | } | 84 | } |
79 | } | 85 | } |