From c051eda02824b48000b87e0507b36ed1fda9ff76 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Fri, 23 Jul 2004 15:12:43 +0000 Subject: Added strcasecmp() to the plugin API git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4925 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugin.c | 1 + apps/plugin.h | 3 ++- apps/plugins/search.c | 14 ++------------ 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'apps') diff --git a/apps/plugin.c b/apps/plugin.c index 93302f31e4..7e5f4866cf 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -256,6 +256,7 @@ static const struct plugin_api rockbox_api = { button_status, button_clear_queue, strncpy, + strcasecmp, }; int plugin_load(char* plugin, void* parameter) diff --git a/apps/plugin.h b/apps/plugin.h index 06a31ade37..1ed2a9baef 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -60,7 +60,7 @@ #endif /* increase this every time the api struct changes */ -#define PLUGIN_API_VERSION 22 +#define PLUGIN_API_VERSION 23 /* update this to latest version if a change to the api struct breaks backwards compatibility (and please take the opportunity to sort in any @@ -292,6 +292,7 @@ struct plugin_api { int (*button_status)(void); void (*button_clear_queue)(void); char *(*strncpy)(char *dst, const char *src, size_t length); + int (*strcasecmp)(const char *, const char *); }; /* defined by the plugin loader (plugin.c) */ diff --git a/apps/plugins/search.c b/apps/plugins/search.c index 55f65f2b2a..8eb13c5842 100644 --- a/apps/plugins/search.c +++ b/apps/plugins/search.c @@ -40,16 +40,6 @@ static int line_end; /* Index of the end of line */ char resultfile[MAX_PATH]; char path[MAX_PATH]; -static int strpcasecmp(const char *s1, const char *s2) -{ - while (*s1 != '\0' && tolower(*s1) == tolower(*s2)) { - s1++; - s2++; - } - - return (*s1 == '\0') ; -} - static void fill_buffer(int pos) { int numread; @@ -94,7 +84,7 @@ static void fill_buffer(int pos) default: if (!found && tolower(buffer[i]) == tolower(search_string[0])) { - found = strpcasecmp(&search_string[0],&buffer[i]) ; + found = rb->strcasecmp(&search_string[0],&buffer[i]) ; } break; } @@ -152,7 +142,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb = api; /* Check the extension. We only allow .m3u files. */ - if(!strpcasecmp(&filename[rb->strlen(filename)-4], ".m3u")) { + if(!rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u")) { rb->splash(HZ, true, "Not a .m3u file"); return PLUGIN_ERROR; } -- cgit v1.2.3