Merge remote-tracking branch 'check/next-cc'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-05 18:31:31 +01:00
28 changed files with 563 additions and 341 deletions

View File

@@ -345,6 +345,18 @@ std::string trim(std::string &str, const std::string &trimChars /*= " \n\r\t"*/)
return result.erase(0, result.find_first_not_of(trimChars));
}
time_t toEpoch(std::string &date)
{
struct tm t;
memset(&t, 0, sizeof(t));
char *p = strptime(date.c_str(), "%Y-%m-%d", &t);
if(p)
return mktime(&t);
return 0;
}
CFileHelpers::CFileHelpers()
{
FileBufSize = 0xFFFF;