From e9daa350d19f6115963133012f5d278cdc29623f Mon Sep 17 00:00:00 2001 From: satbaby Date: Tue, 14 Sep 2010 16:08:54 +0000 Subject: [PATCH] fix Wshadow compil git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@769 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/driver/framebuffer.cpp | 6 +++--- src/gui/bouquetlist.cpp | 5 ++--- src/gui/widget/vfdcontroler.cpp | 2 +- src/zapit/src/zapit.cpp | 38 ++++++++++++++++----------------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index fcb883160..2321d10ab 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -479,14 +479,14 @@ int CFrameBuffer::setMode(unsigned int /*nxRes*/, unsigned int /*nyRes*/, unsign xRes = screeninfo.xres; yRes = screeninfo.yres; bpp = screeninfo.bits_per_pixel; - fb_fix_screeninfo fix; + fb_fix_screeninfo _fix; - if (ioctl(fd, FBIOGET_FSCREENINFO, &fix)<0) { + if (ioctl(fd, FBIOGET_FSCREENINFO, &_fix)<0) { perror("FBIOGET_FSCREENINFO"); return -1; } - stride = fix.line_length; + stride = _fix.line_length; printf("FB: %dx%dx%d line length %d. %s nevis GXA accelerator.\n", xRes, yRes, bpp, stride, #ifdef USE_NEVIS_GXA "Using" diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index d236bd7cf..67a0f8c38 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -211,7 +211,6 @@ int CBouquetList::doMenu() int i = 0; int select = -1; static int old_selected = 0; - int ret = menu_return::RETURN_NONE; signed int bouquet_id; char cnt[5]; CZapitBouquet * tmp, * zapitBouquet; @@ -232,7 +231,7 @@ int CBouquetList::doMenu() sprintf(cnt, "%d", i); if(!zapitBouquet->bUser) { menu->addItem(new CMenuForwarder(LOCALE_FAVORITES_COPY, true, NULL, selector, cnt, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE), old_selected == i ++); - ret = menu->exec(NULL, ""); + menu->exec(NULL, ""); delete menu; delete selector; printf("CBouquetList::doMenu: %d selected\n", select); @@ -259,7 +258,7 @@ int CBouquetList::doMenu() return -1; } else { menu->addItem(new CMenuForwarder(LOCALE_BOUQUETEDITOR_DELETE, true, NULL, selector, cnt, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE), old_selected == i ++); - ret = menu->exec(NULL, ""); + menu->exec(NULL, ""); delete menu; delete selector; printf("CBouquetList::doMenu: %d selected\n", select); diff --git a/src/gui/widget/vfdcontroler.cpp b/src/gui/widget/vfdcontroler.cpp index 01c2f9121..498f52dee 100644 --- a/src/gui/widget/vfdcontroler.cpp +++ b/src/gui/widget/vfdcontroler.cpp @@ -73,7 +73,7 @@ CVfdControler::CVfdControler(const neutrino_locale_t Name, CChangeObserver* Obse tmpwidth = g_Font[font_info]->getRenderWidth("15"); width = w_max((15 + lwidth + 15 + 120 + 10 + tmpwidth + 10 + 15), 0); - height = h_max(hheight+ mheight* (3+neo_hw)+ +mheight/2, 0); + height = h_max(hheight+ mheight* (3+neo_hw) +mheight/2, 0); x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth()-width) >> 1); y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 71a744ed5..e97f080d6 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -919,23 +919,23 @@ bool zapit_parse_command(CBasicMessage::Header &rmsg, int connfd) } case CZapitMessages::CMD_GET_DELIVERY_SYSTEM: { - CZapitMessages::responseDeliverySystem response; + CZapitMessages::responseDeliverySystem _response; switch (frontend->getInfo()->type) { case FE_QAM: - response.system = DVB_C; + _response.system = DVB_C; break; case FE_QPSK: - response.system = DVB_S; + _response.system = DVB_S; break; case FE_OFDM: - response.system = DVB_T; + _response.system = DVB_T; break; default: WARN("Unknown type %d", frontend->getInfo()->type); return false; } - CBasicServer::send_data(connfd, &response, sizeof(response)); + CBasicServer::send_data(connfd, &_response, sizeof(_response)); break; } @@ -967,45 +967,45 @@ bool zapit_parse_command(CBasicMessage::Header &rmsg, int connfd) } case CZapitMessages::CMD_GET_CHANNEL_NAME: { - t_channel_id requested_channel_id; - CZapitMessages::responseGetChannelName response; + t_channel_id requested_channel_id; + CZapitMessages::responseGetChannelName _response; CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id)); if(requested_channel_id == 0) { if(channel) { - strncpy(response.name, channel->getName().c_str(), CHANNEL_NAME_SIZE); - response.name[CHANNEL_NAME_SIZE-1] = 0; + strncpy(_response.name, channel->getName().c_str(), CHANNEL_NAME_SIZE); + _response.name[CHANNEL_NAME_SIZE-1] = 0; } else - response.name[0] = 0; + _response.name[0] = 0; } else { tallchans_iterator it = allchans.find(requested_channel_id); if (it == allchans.end()) - response.name[0] = 0; + _response.name[0] = 0; else - strncpy(response.name, it->second.getName().c_str(), CHANNEL_NAME_SIZE); - response.name[CHANNEL_NAME_SIZE-1] = 0; + strncpy(_response.name, it->second.getName().c_str(), CHANNEL_NAME_SIZE); + _response.name[CHANNEL_NAME_SIZE-1] = 0; } - CBasicServer::send_data(connfd, &response, sizeof(response)); + CBasicServer::send_data(connfd, &_response, sizeof(_response)); break; } case CZapitMessages::CMD_IS_TV_CHANNEL: { t_channel_id requested_channel_id; - CZapitMessages::responseGeneralTrueFalse response; + CZapitMessages::responseGeneralTrueFalse _response; CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id)); tallchans_iterator it = allchans.find(requested_channel_id); if (it == allchans.end()) { it = nvodchannels.find(requested_channel_id); /* if in doubt (i.e. unknown channel) answer yes */ if (it == nvodchannels.end()) - response.status = true; + _response.status = true; else /* FIXME: the following check is no even remotely accurate */ - response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); + _response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); } else /* FIXME: the following check is no even remotely accurate */ - response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); + _response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); - CBasicServer::send_data(connfd, &response, sizeof(response)); + CBasicServer::send_data(connfd, &_response, sizeof(_response)); break; }