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

basicserver.cpp and zapitclient.cpp 2.try to fix compiler warnings, suggested by Seife

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-01-11 23:13:41 +01:00
parent d39a85b951
commit 4997a9440a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connection/basicserver.cpp
View File

@@ -132,7 +132,7 @@ bool CBasicServer::parse(bool (parse_command)(CBasicMessage::Header &rmsg, int c
memset(&rmsg, 0, sizeof(rmsg)); memset(&rmsg, 0, sizeof(rmsg));
ssize_t r = read(conn_fd, &rmsg, sizeof(rmsg)); ssize_t r = read(conn_fd, &rmsg, sizeof(rmsg));
if (r && rmsg.version == version) if (r == sizeof(rmsg) && rmsg.version == version)
parse_another_command = parse_command(rmsg, conn_fd); parse_another_command = parse_command(rmsg, conn_fd);
else else
printf("[%s] Command ignored: cmd %x version %d received - server cmd version is %d\n", name.c_str(), rmsg.cmd, rmsg.version, version); printf("[%s] Command ignored: cmd %x version %d received - server cmd version is %d\n", name.c_str(), rmsg.cmd, rmsg.version, version);

7
src/zapit/lib/zapitclient.cpp
View File

@@ -381,7 +381,7 @@ void CZapitClient::zaptoNvodSubService(const int num)
/* bouquets are numbered starting at 0 */ /* bouquets are numbered starting at 0 */
void CZapitClient::getBouquets(BouquetList& bouquets, const bool emptyBouquetsToo, const bool utf_encoded, channelsMode mode) void CZapitClient::getBouquets(BouquetList& bouquets, const bool emptyBouquetsToo, const bool utf_encoded, channelsMode mode)
{ {
char buffer[30 + 1]; char buffer[30];
CZapitMessages::commandGetBouquets msg; CZapitMessages::commandGetBouquets msg;
VALGRIND_PARANOIA; VALGRIND_PARANOIA;
@@ -400,9 +400,8 @@ void CZapitClient::getBouquets(BouquetList& bouquets, const bool emptyBouquetsTo
if (!utf_encoded) if (!utf_encoded)
{ {
buffer[30] = (char) 0x00; strncpy(buffer, response.name, sizeof(buffer));
strncpy(buffer, response.name, sizeof(buffer)-1); snprintf(response.name,sizeof(buffer),"%s",ZapitTools::UTF8_to_Latin1(buffer).c_str());
snprintf(response.name,sizeof(buffer)-1,"%s",ZapitTools::UTF8_to_Latin1(buffer).c_str());
} }
bouquets.push_back(response); bouquets.push_back(response);
} }