mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

Browse Source
This commit is contained in:
[CST] Focus
2012-06-18 20:04:58 +04:00
parent 90b63622b8 aff97b7c18
commit b15a335144
9 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libupnpclient/UPNPDevice.cpp
View File

@@ -387,7 +387,7 @@ std::string CUPnPDevice::HTTP(std::string url, std::string post, std::string act
}
path = url.substr(pos2);
if (post.size())
if (!post.empty())
command << "POST " << path << " HTTP/1.0\r\n";
else
command << "GET " << path << " HTTP/1.0\r\n";
@@ -397,18 +397,18 @@ std::string CUPnPDevice::HTTP(std::string url, std::string post, std::string act
command << "Accept: text/xml\r\n";
command << "Connection: Close\r\n";
if (post.size())
if (!post.empty())
{
command << "Content-Length: " << post.size() << "\r\n";
command << "Content-Type: text/xml\r\n";
}
if (action.size())
if (!action.empty())
command << "SOAPAction: \"" << action << "\"\r\n";
command << "\r\n";
if (post.size())
if (!post.empty())
command << post;
t_socket = socket(PF_INET, SOCK_STREAM, 0);

2
lib/timerdclient/timerdclient.cpp
View File

@@ -247,7 +247,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
//printf("[CTimerdClient] checking for overlapping timers\n");
CTimerd::TimerList overlappingTimer;
overlappingTimer = getOverlappingTimers(alarmtime, stoptime);
if (overlappingTimer.size() > 0)
if (!overlappingTimer.empty())
{
// timerd starts eventID at 0 so we can return -1
return -1;