summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blacklist.c4
-rw-r--r--createcats.c4
-rw-r--r--epgsearch.c2
-rw-r--r--epgsearchcats.c5
-rw-r--r--epgsearchext.c4
-rw-r--r--epgsearchtools.c4
-rw-r--r--menu_deftimercheckmethod.c2
-rw-r--r--menu_searchresults.c4
-rw-r--r--noannounce.c2
-rw-r--r--searchtimer_thread.c2
-rw-r--r--switchtimer.c2
-rw-r--r--timerdone.c2
-rw-r--r--uservars.h3
13 files changed, 29 insertions, 11 deletions
diff --git a/blacklist.c b/blacklist.c
index dd8615b..7d10275 100644
--- a/blacklist.c
+++ b/blacklist.c
@@ -379,6 +379,8 @@ bool cBlacklist::Parse(const char *s)
break;
case 21: ignoreMissingEPGCats = atoi(value);
break;
+ default:
+ break;
} //switch
}
parameter++;
@@ -478,6 +480,8 @@ bool cBlacklist::ParseExtEPGEntry(const char *s)
}
}
break;
+ default:
+ break;
} //switch
}
parameter++;
diff --git a/createcats.c b/createcats.c
index 8b21ef5..2113923 100644
--- a/createcats.c
+++ b/createcats.c
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
{ "maxvalues", required_argument, NULL, 'v' },
{ "maxlength", required_argument, NULL, 'l' },
{ "help", no_argument, NULL, 'h' },
- { NULL }
+ { NULL, no_argument, NULL, 0 }
};
int c;
@@ -223,6 +223,8 @@ int main(int argc, char *argv[])
printf(" as a category value\n");
printf("-h, --help this help\n\n");
return 0;
+ default:
+ break;
}
}
diff --git a/epgsearch.c b/epgsearch.c
index 42facac..6109dbb 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -173,7 +173,7 @@ bool cPluginEpgsearch::ProcessArgs(int argc, char *argv[])
{ "verbose", required_argument, NULL, 'v' },
{ "mailcmd", required_argument, NULL, 'm' },
{ "reloadmenuconf", no_argument, NULL, 'r' },
- { NULL }
+ { NULL, no_argument, NULL, 0 }
};
int c=0,i=0;
diff --git a/epgsearchcats.c b/epgsearchcats.c
index 93d0e57..32c52f7 100644
--- a/epgsearchcats.c
+++ b/epgsearchcats.c
@@ -102,9 +102,10 @@ bool cSearchExtCat::Parse(const char *s)
break;
}
case 5:
- searchmode = atoi(value);
+ searchmode = atoi(value);
+ break;
+ default:
break;
- break;
} //switch
}
parameter++;
diff --git a/epgsearchext.c b/epgsearchext.c
index 1ea01ae..0df32ab 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -602,6 +602,8 @@ bool cSearchExt::Parse(const char *s)
case 52:
compareSummaryMatchInPercent = atoi(value);
break;
+ default:
+ break;
} //switch
}
parameter++;
@@ -814,6 +816,8 @@ bool cSearchExt::ParseExtEPGEntry(const char *s)
}
}
break;
+ default:
+ break;
} //switch
}
parameter++;
diff --git a/epgsearchtools.c b/epgsearchtools.c
index c6f3aa2..c58ccc0 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -366,7 +366,7 @@ bool MatchesSearchMode(const char* szTest, const char* searchText, int mode, con
}
else if (mode == 5) // fuzzy
{
- AFUZZY af = { NULL, NULL, NULL, NULL, NULL, NULL };
+ AFUZZY af = { NULL, NULL, NULL, NULL, NULL, NULL, { 0 }, { 0 }, 0, 0, 0, 0, 0, 0 };
string query = searchText?searchText:"";
if (query.size() > 32) query = query.substr(0, 32);
afuzzy_init(query.c_str(), tolerance, 0, &af);
@@ -887,6 +887,8 @@ char* FixSeparators(char* buffer, char sep)
i = j;
c = 0;
break;
+ default:
+ break;
}
}
}
diff --git a/menu_deftimercheckmethod.c b/menu_deftimercheckmethod.c
index b939f8d..a5d11f7 100644
--- a/menu_deftimercheckmethod.c
+++ b/menu_deftimercheckmethod.c
@@ -64,6 +64,8 @@ bool cDefTimerCheckMode::Parse(const char *s)
break;
case 2: mode = atol(value);
break;
+ default:
+ break;
} //switch
}
parameter++;
diff --git a/menu_searchresults.c b/menu_searchresults.c
index aba990b..7570c82 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -758,7 +758,7 @@ bool cMenuSearchResultsForRecs::BuildList()
if (!match)
{
- AFUZZY af = { NULL, NULL, NULL, NULL, NULL, NULL };
+ AFUZZY af = { NULL, NULL, NULL, NULL, NULL, NULL, { 0 }, { 0 }, 0, 0, 0, 0, 0, 0 };
if (s1.size() > 32) s1 = s1.substr(0, 32);
afuzzy_init(s1.c_str(), tolerance, 0, &af);
/* Checking substring */
@@ -768,7 +768,7 @@ bool cMenuSearchResultsForRecs::BuildList()
}
if (!match)
{
- AFUZZY af = { NULL, NULL, NULL, NULL, NULL, NULL };
+ AFUZZY af = { NULL, NULL, NULL, NULL, NULL, NULL, { 0 }, { 0 }, 0, 0, 0, 0, 0, 0 };
if (s2.size() > 32) s2 = s2.substr(0, 32);
afuzzy_init(s2.c_str(), tolerance, 0, &af);
/* Checking substring */
diff --git a/noannounce.c b/noannounce.c
index c8c608a..ca977d6 100644
--- a/noannounce.c
+++ b/noannounce.c
@@ -106,6 +106,8 @@ bool cNoAnnounce::Parse(const char *s)
break;
case 5: nextAnnounce = atol(value);
break;
+ default:
+ break;
} //switch
}
parameter++;
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index e5f5665..3045529 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -957,7 +957,7 @@ void cSearchTimerThread::CheckManualTimers()
LogFile.Log(3,"selected candidate is '%s~%s' (%s - %s)", event->Title(), event->ShortText()?event->ShortText():"", GETDATESTRING(event), GETTIMESTRING(event));
if ((maxweight > 0 && event->StartTime() - bstart != ti->StartTime()) || (event->EndTime() + bstop != ti->StopTime()))
ModifyManualTimer(event, ti, bstart, bstop);
- else if (maxweight == 0)
+ else if (maxweight <= 0)
LogFile.Log(3,"selected candidate is too bad");
}
else
diff --git a/switchtimer.c b/switchtimer.c
index 5f2135b..12ae04d 100644
--- a/switchtimer.c
+++ b/switchtimer.c
@@ -95,6 +95,8 @@ bool cSwitchTimer::Parse(const char *s)
case 6:
unmute = atoi(value);
break;
+ default:
+ break;
} //switch
}
parameter++;
diff --git a/timerdone.c b/timerdone.c
index 246e1b3..b5a0cc4 100644
--- a/timerdone.c
+++ b/timerdone.c
@@ -107,6 +107,8 @@ bool cTimerDone::Parse(const char *s)
break;
case 6: shorttext = value;
break;
+ default:
+ break;
} //switch
}
parameter++;
diff --git a/uservars.h b/uservars.h
index 9cd0117..84e9ae9 100644
--- a/uservars.h
+++ b/uservars.h
@@ -40,9 +40,6 @@ using std::set;
using std::map;
using std::ostringstream;
-string NumToString(long num);
-int FindIgnoreCase(const string& expr, const string& query);
-
class cUserVar : public cListObject {
const cEvent* oldEvent; // cache
bool oldescapeStrings;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 22:15:10 +0000