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

error: declaration of 'nBufSize' shadows a previous local

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@108 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
mws
2009-12-22 12:33:25 +00:00
parent c77b7f37c8
commit 023753126d
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/sectionsdclient/sectionsdclient.cpp
View File

@@ -84,7 +84,7 @@ void CSectionsdClient::registerEvent(const unsigned int eventID, const unsigned
msg2.clientID = clientID; msg2.clientID = clientID;
strcpy(msg2.udsName, udsName); strcpy(msg2.udsName, udsName);
send(sectionsd::CMD_registerEvents, (char*)&msg2, sizeof(msg2)); send(sectionsd::CMD_registerEvents, (char*)&msg2, sizeof(msg2));
close_connection(); close_connection();
@@ -174,7 +174,7 @@ void CSectionsdClient::setServiceChanged(const t_channel_id channel_id, const bo
sectionsd::commandSetServiceChanged msg; sectionsd::commandSetServiceChanged msg;
msg.channel_id = channel_id; msg.channel_id = channel_id;
msg.requestEvent = requestEvent; msg.requestEvent = requestEvent;
send(sectionsd::serviceChanged, (char *)&msg, sizeof(msg)); send(sectionsd::serviceChanged, (char *)&msg, sizeof(msg));
@@ -388,12 +388,12 @@ CChannelEventList CSectionsdClient::getChannelEvents(const bool tv_mode, t_chann
} }
//GU:EPG //GU:EPG
/* This function does initiate a search for a keyword in all EPG Event of the Channel channel_id in sectionsd. /* This function does initiate a search for a keyword in all EPG Event of the Channel channel_id in sectionsd.
The parameter search_typ does specify the search mode The parameter search_typ does specify the search mode
0: none -> all EPG events of the channel are returned 0: none -> all EPG events of the channel are returned
1: keyword search in EPG Title 1: keyword search in EPG Title
2: keyword search in EPG short description (INFO1) 2: keyword search in EPG short description (INFO1)
3: keyword search in EPG description (INFO2) 3: keyword search in EPG description (INFO2)
In case of a match, the EPG event is added to the Eventlist eList. In case of a match, the EPG event is added to the Eventlist eList.
*/ */
bool CSectionsdClient::getEventsServiceKeySearchAdd(CChannelEventList& eList,const t_channel_id channel_id,char search_typ,std::string& search_text) bool CSectionsdClient::getEventsServiceKeySearchAdd(CChannelEventList& eList,const t_channel_id channel_id,char search_typ,std::string& search_text)
@@ -407,26 +407,26 @@ bool CSectionsdClient::getEventsServiceKeySearchAdd(CChannelEventList& eList,con
char* pSData = new char[nBufSize]; char* pSData = new char[nBufSize];
char* pSData_ptr = pSData; char* pSData_ptr = pSData;
*(t_channel_id*)pSData_ptr = channel_id; *(t_channel_id*)pSData_ptr = channel_id;
pSData_ptr += sizeof(t_channel_id); pSData_ptr += sizeof(t_channel_id);
*pSData_ptr = search_typ; *pSData_ptr = search_typ;
pSData_ptr += sizeof(char); pSData_ptr += sizeof(char);
strcpy(pSData_ptr,search_text.c_str()); strcpy(pSData_ptr,search_text.c_str());
if (send(sectionsd::allEventsChannelIDSearch, pSData, nBufSize)) if (send(sectionsd::allEventsChannelIDSearch, pSData, nBufSize))
{ {
int nBufSize = readResponse(); int nBufSize2 = readResponse();
if( nBufSize > 0) if( nBufSize2 > 0)
{ {
char* pData = new char[nBufSize]; char* pData = new char[nBufSize2];
receive_data(pData, nBufSize); receive_data(pData, nBufSize2);
char* dp = pData; char* dp = pData;
// int a = eList.size(); // int a = eList.size();
while(dp < pData + nBufSize) while(dp < pData + nBufSize2)
{ {
CChannelEvent aEvent; CChannelEvent aEvent;
@@ -640,7 +640,7 @@ bool CSectionsdClient::getEPGid(const event_id_t eventid, const time_t starttime
sectionsd::commandGetEPGid msg; sectionsd::commandGetEPGid msg;
msg.eventid = eventid; msg.eventid = eventid;
msg.starttime = starttime; msg.starttime = starttime;
if (send(sectionsd::epgEPGid, (char *)&msg, sizeof(msg))) if (send(sectionsd::epgEPGid, (char *)&msg, sizeof(msg)))
{ {
@@ -726,7 +726,7 @@ bool CSectionsdClient::getEPGidShort(const event_id_t eventid, CShortEPGData * e
} }
close_connection(); close_connection();
return false; return false;
} }
#ifdef ENABLE_PPT #ifdef ENABLE_PPT