Browse Source

Merge pull request #3004 from ngosang/cppcheck_fixes

Cppcheck: scope reduction & unused variables
adaptive-webui-19844
sledgehammer999 10 years ago
parent
commit
4d848e99f0
  1. 3
      src/core/http/requestparser.cpp
  2. 4
      src/core/utils/misc.cpp
  3. 3
      src/gui/rss/rssfeed.cpp

3
src/core/http/requestparser.cpp

@ -79,9 +79,8 @@ RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray& data, @@ -79,9 +79,8 @@ RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray& data,
}
// Parse HTTP request message
int content_length = 0;
if (m_request.headers.contains("content-length")) {
content_length = m_request.headers["content-length"].toInt();
int content_length = m_request.headers["content-length"].toInt();
if (content_length > static_cast<int>(m_maxContentLength)) {
qWarning() << Q_FUNC_INFO << "bad request: message too long";
return BadRequest;

4
src/core/utils/misc.cpp

@ -145,9 +145,7 @@ void Utils::Misc::shutdownComputer(ShutdownAction action) @@ -145,9 +145,7 @@ void Utils::Misc::shutdownComputer(ShutdownAction action)
AppleEvent eventReply = {typeNull, NULL};
AppleEvent appleEventToSend = {typeNull, NULL};
OSStatus error = noErr;
error = AECreateDesc(typeProcessSerialNumber, &kPSNOfSystemProcess,
OSStatus error = AECreateDesc(typeProcessSerialNumber, &kPSNOfSystemProcess,
sizeof(kPSNOfSystemProcess), &targetDesc);
if (error != noErr)

3
src/gui/rss/rssfeed.cpp

@ -118,7 +118,6 @@ void RssFeed::loadItemsFromDisk() @@ -118,7 +118,6 @@ void RssFeed::loadItemsFromDisk()
}
void RssFeed::addArticle(const RssArticlePtr& article) {
int lbIndex = -1;
int max_articles = Preferences::instance()->getRSSMaxArticlesPerFeed();
if (!m_articles.contains(article->guid())) {
@ -132,7 +131,7 @@ void RssFeed::addArticle(const RssArticlePtr& article) { @@ -132,7 +131,7 @@ void RssFeed::addArticle(const RssArticlePtr& article) {
// Insertion sort
RssArticleList::Iterator lowerBound = qLowerBound(m_articlesByDate.begin(), m_articlesByDate.end(), article, rssArticleDateRecentThan);
m_articlesByDate.insert(lowerBound, article);
lbIndex = m_articlesByDate.indexOf(article);
int lbIndex = m_articlesByDate.indexOf(article);
if (m_articlesByDate.size() > max_articles) {
RssArticlePtr oldestArticle = m_articlesByDate.takeLast();
m_articles.remove(oldestArticle->guid());

Loading…
Cancel
Save