diff -urNad vdr-plugin-epgsearch-0.9.14a~/createcats.c vdr-plugin-epgsearch-0.9.14a/createcats.c --- vdr-plugin-epgsearch-0.9.14a~/createcats.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/createcats.c 2006-03-05 20:26:07.418794784 +0000 @@ -150,7 +150,7 @@ unsigned int maxvalues = MAXVALUES; unsigned int maxlength = MAXNAMELENGTH; - static struct option long_options[] = { + static const struct option long_options[] = { { "minappearance", required_argument, NULL, 'm' }, { "maxvalues", required_argument, NULL, 'v' }, { "maxlength", required_argument, NULL, 'l' }, diff -urNad vdr-plugin-epgsearch-0.9.14a~/epgsearch.c vdr-plugin-epgsearch-0.9.14a/epgsearch.c --- vdr-plugin-epgsearch-0.9.14a~/epgsearch.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/epgsearch.c 2006-03-05 20:26:21.373894963 +0000 @@ -30,9 +30,9 @@ #include "blacklist.h" -static const char *VERSION = "0.9.14a"; -static const char *DESCRIPTION = "search the EPG for repeats and more"; -static const char *MAINMENUENTRY = "Search"; +static const char VERSION[] = "0.9.14a"; +static const char DESCRIPTION[] = "search the EPG for repeats and more"; +static const char MAINMENUENTRY[] = "Search"; const char *SVDRPSendCmd = "svdrpsend.pl"; char *ConfigDir = NULL; char *LogFileName = NULL; @@ -120,7 +120,7 @@ return true; } - static struct option long_options[] = { + static const struct option long_options[] = { { "svdrpsendcmd", required_argument, NULL, 'f' }, { "config", required_argument, NULL, 'c' }, { "logfile", required_argument, NULL, 'l' }, diff -urNad vdr-plugin-epgsearch-0.9.14a~/epgsearchsetup.c vdr-plugin-epgsearch-0.9.14a/epgsearchsetup.c --- vdr-plugin-epgsearch-0.9.14a~/epgsearchsetup.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/epgsearchsetup.c 2006-03-05 20:26:07.422794526 +0000 @@ -13,8 +13,6 @@ const char *StartMenuMode[2]; const char *AddSubtitleMode[3]; -extern const char *AllowedChars; - #define REDBUTTON (data.SetupMode?tr("Button$Standard"):tr("Button$Extended")) cMenuEPGSearchSetup::cMenuEPGSearchSetup(void) diff -urNad vdr-plugin-epgsearch-0.9.14a~/menu_blacklistedit.c vdr-plugin-epgsearch-0.9.14a/menu_blacklistedit.c --- vdr-plugin-epgsearch-0.9.14a~/menu_blacklistedit.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/menu_blacklistedit.c 2006-03-05 20:26:07.422794526 +0000 @@ -12,7 +12,7 @@ extern cChannelGroups ChannelGroups; extern cSearchExtCats SearchExtCats; -extern const char *AllowedChars; +extern const char AllowedChars[]; // --- cMenuBlacklistEdit -------------------------------------------------------- cMenuBlacklistEdit::cMenuBlacklistEdit(cBlacklist *Blacklist, bool New) diff -urNad vdr-plugin-epgsearch-0.9.14a~/menu_myedittimer.c vdr-plugin-epgsearch-0.9.14a/menu_myedittimer.c --- vdr-plugin-epgsearch-0.9.14a~/menu_myedittimer.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/menu_myedittimer.c 2006-03-05 20:26:07.422794526 +0000 @@ -8,7 +8,6 @@ #include "recstatus.h" #include -extern const char *AllowedChars; extern int PluginIndex; cMenuMyEditTimer::cMenuMyEditTimer(cTimer *Timer, bool New, const cEvent* Event, const cChannel* forcechannel) diff -urNad vdr-plugin-epgsearch-0.9.14a~/menu_searchedit.c vdr-plugin-epgsearch-0.9.14a/menu_searchedit.c --- vdr-plugin-epgsearch-0.9.14a~/menu_searchedit.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/menu_searchedit.c 2006-03-05 20:26:07.422794526 +0000 @@ -10,12 +10,9 @@ #include "menu_blacklists.h" #include - cChannelGroups ChannelGroups; cSearchExtCats SearchExtCats; -const char *AllowedChars = "$ abcdefghijklmnopqrstuvwxyz0123456789-.#~\\^$[]|()*+?{}/:%"; - // --- cMenuEditSearchExt -------------------------------------------------------- cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Template) :cOsdMenu(tr("Edit search"),32) diff -urNad vdr-plugin-epgsearch-0.9.14a~/menu_templateedit.c vdr-plugin-epgsearch-0.9.14a/menu_templateedit.c --- vdr-plugin-epgsearch-0.9.14a~/menu_templateedit.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/menu_templateedit.c 2006-03-05 20:26:07.422794526 +0000 @@ -12,8 +12,6 @@ extern cChannelGroups ChannelGroups; extern cSearchExtCats SearchExtCats; -extern const char *AllowedChars; - eOSState cMenuEditTemplate::ProcessKey(eKeys Key) { bool bHadSubMenu = HasSubMenu(); diff -urNad vdr-plugin-epgsearch-0.9.14a~/tools.c vdr-plugin-epgsearch-0.9.14a/tools.c --- vdr-plugin-epgsearch-0.9.14a~/tools.c 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/tools.c 2006-03-05 20:26:07.422794526 +0000 @@ -12,6 +12,8 @@ #endif #include +const char AllowedChars[] = "$ abcdefghijklmnopqrstuvwxyz0123456789-.#~\\^$[]|()*+?{}/:%"; + #define MATCHLIMIT 0.9 int CompareEventTime(const void *p1, const void *p2) diff -urNad vdr-plugin-epgsearch-0.9.14a~/tools.h vdr-plugin-epgsearch-0.9.14a/tools.h --- vdr-plugin-epgsearch-0.9.14a~/tools.h 2006-03-05 20:25:16.000000000 +0000 +++ vdr-plugin-epgsearch-0.9.14a/tools.h 2006-03-05 20:26:07.422794526 +0000 @@ -76,6 +76,7 @@ (EVENT && EPGSearchConfig.showShortText && !isempty((EVENT)->ShortText()))?" ~ ":"", \ (EVENT && EPGSearchConfig.showShortText && !isempty((EVENT)->ShortText()))?(EVENT)->ShortText():"" +extern const char AllowedChars[]; extern char* ConfigDir;