From d6b2eae19da715c6c4cb69eaac64758b7c9cd804 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Tue, 24 Jan 2017 23:21:45 +0000 Subject: [PATCH] Some compiler warning fixes --- command.cc | 2 +- defines.h | 4 ++++ demuxer.cc | 4 ++-- dsock.cc | 2 +- dsock.h | 2 +- dvbsubtitles.cc | 4 ++-- osdvector.h | 2 +- player.cc | 0 remote.cc | 5 ++--- remote.h | 2 +- remotelinux.cc | 6 +++--- remotelinux.h | 2 +- surface.cc | 16 ++++++++-------- tcp.cc | 7 +++---- teletextdecodervbiebu.cc | 2 +- vdr.cc | 10 +++++----- vepg.cc | 2 +- vepglistadvanced.cc | 2 +- vvideorec.cc | 2 +- wol.cc | 8 +++++--- wpictureview.cc | 2 +- wsymbol.cc | 2 +- wtvmedia.cc | 3 +++ 23 files changed, 49 insertions(+), 42 deletions(-) mode change 100755 => 100644 player.cc mode change 100755 => 100644 tcp.cc diff --git a/command.cc b/command.cc index 2bd5f49..6c6d99c 100644 --- a/command.cc +++ b/command.cc @@ -812,7 +812,7 @@ int Command::getLangPref(bool subtitle,const char* langcode) size_t pos=(*itty).langcode.find(templangcode); if (pos != string::npos) { vector::iterator itty2=langcodes.begin(); - for (int i=0; ilog("SUBTITLES", Log::DEBUG, "cTimeMs: clock_gettime(CLOCK_REALTIME) failed"); - + Log::getInstance()->log("SUBTITLES", Log::ERR, "cTimeMs: clock_gettime(CLOCK_REALTIME) failed"); + return 0; } void cTimeMs::Set(int Ms) diff --git a/osdvector.h b/osdvector.h index 41935b2..9babaa6 100644 --- a/osdvector.h +++ b/osdvector.h @@ -71,7 +71,7 @@ public: { instr=DrawNoop; x=y=w=h=0; - reference = NULL; + reference = VECTOR_HANDLE_INIT; }; inline static SVGCommand PaintPath(float ix, float iy, float iw, float ih, PathIndex path, VectorHandle ref) diff --git a/player.cc b/player.cc old mode 100755 new mode 100644 diff --git a/remote.cc b/remote.cc index 2144520..c0e4c51 100644 --- a/remote.cc +++ b/remote.cc @@ -247,10 +247,9 @@ void Remote::LoadKeysConfig(VDR *vdr,const char *cfg) ULONG number=0; if (sscanf(cfg,"%ld",&number) != 1) return; Log::getInstance()->log("Remote", Log::INFO, "Config General/Remote keys num keys %d",number); - char buffer[1024]; char keybuf[1024]; - for (int i = 0; i < number; i++) { - sprintf(keybuf, "RemoteKey%d", i); + for (ULONG i = 0; i < number; i++) { + sprintf(keybuf, "RemoteKey%lu", i); const char *keytrans = vdr->configLoad("General", keybuf); if (keytrans) { ULONG ul1, ul2; diff --git a/remote.h b/remote.h index 19f3701..9ebc4e4 100644 --- a/remote.h +++ b/remote.h @@ -49,7 +49,7 @@ class Remote: public AbstractOption void SaveKeysConfig(); void EnterLearningMode(UCHAR command); - virtual int init(char *devName)=0; + virtual int init(const char *devName)=0; virtual int shutdown()=0; virtual UCHAR getButtonPress(int how)=0; virtual void clearBuffer()=0; diff --git a/remotelinux.cc b/remotelinux.cc index f5ef7b8..2d0270b 100644 --- a/remotelinux.cc +++ b/remotelinux.cc @@ -77,7 +77,7 @@ RemoteLinux::~RemoteLinux() #define test_bit(input,b) ((1 << ((b) % 8))&(input)[b / 8] ) -int RemoteLinux::init(char* devName) +int RemoteLinux::init(const char* devName) { if (initted) return 0; initted = 1; @@ -248,7 +248,7 @@ UCHAR RemoteLinux::getButtonPress(int waitType) { FD_ZERO(&readfds); int maxfd = 0; - for (int i = 0; i < devices.size(); i++) { + for (unsigned int i = 0; i < devices.size(); i++) { int cur_fd = devices[i]; maxfd = max(cur_fd, maxfd); FD_SET(cur_fd, &readfds); @@ -276,7 +276,7 @@ UCHAR RemoteLinux::getButtonPress(int waitType) { return NA_SIGNAL; } - for (int i = 0; i < devices.size(); i++) { + for (unsigned int i = 0; i < devices.size(); i++) { int cur_fd = devices[i]; if (FD_ISSET(cur_fd, &readfds)) { struct input_event ev; diff --git a/remotelinux.h b/remotelinux.h index 5e996ae..da6b592 100644 --- a/remotelinux.h +++ b/remotelinux.h @@ -40,7 +40,7 @@ class RemoteLinux : public Remote RemoteLinux(); virtual ~RemoteLinux(); - int init(char *devName); + int init(const char *devName); int shutdown(); int getDevice(); UCHAR getButtonPress(int how); diff --git a/surface.cc b/surface.cc index d3397b3..bf49f0a 100644 --- a/surface.cc +++ b/surface.cc @@ -254,8 +254,8 @@ void Surface::drawTTChar(int ox, int oy, int x, int y, cTeletextChar c) } else { charsizey=18; } - int ttcharsizex=12; - int ttcharsizey=10; + //int ttcharsizex=12; + //int ttcharsizey=10; int screenposx=charsizex*x+ox; //12*40= 480 250 int screenposy=y*charsizey+oy; @@ -285,11 +285,11 @@ void Surface::drawTTChar(int ox, int oy, int x, int y, cTeletextChar c) (uuc.green*fac1+ulc.green*fac2+luc.green*fac3+llc.green*fac4)/256, (uuc.blue*fac1+ulc.blue*fac2+luc.blue*fac3+llc.blue*fac4)/256, (uuc.alpha*fac1+ulc.alpha*fac2+luc.alpha*fac3+llc.alpha*fac4)/256); //if this is too slow make a table - int c = ( (res.alpha << 24 ) - | (res.red << 16) - | (res.green << 8) - | (res.blue ) ); - drawPixel(screenposx+px,screenposy+py,c, true); + int newcolour = ( (res.alpha << 24) + | (res.red << 16) + | (res.green << 8) + | (res.blue ) ); + drawPixel(screenposx+px, screenposy+py, newcolour, true); } } @@ -302,7 +302,7 @@ void Surface::drawTTChar(int ox, int oy, int x, int y, cTeletextChar c) void Surface::drawMonoBitmap(UCHAR* base, int dx, int dy, unsigned int height, unsigned int width, DrawStyle& nextColour) { startFastDraw(); - int x, y; + unsigned int x, y; unsigned int bytesIn, bitsIn; int widthBytes=width/8; for (y = 0; y < height; y++) { diff --git a/tcp.cc b/tcp.cc old mode 100755 new mode 100644 index ea1c80f..91e9049 --- a/tcp.cc +++ b/tcp.cc @@ -238,7 +238,6 @@ int TCP::sendData(void* bufR, size_t count) { size_t bytes_sent = 0; int this_write; - int temp_write; unsigned char* buf = (unsigned char*)bufR; @@ -249,11 +248,11 @@ int TCP::sendData(void* bufR, size_t count) do { #ifndef WIN32 - temp_write = this_write = write(sock, buf, count - bytes_sent); -// Log::getInstance()->log("TCP", Log::DEBUG, "TCP has written %i bytes", temp_write); + this_write = write(sock, buf, count - bytes_sent); +// Log::getInstance()->log("TCP", Log::DEBUG, "TCP has written %i bytes", this_write); } while ( (this_write < 0) && (errno == EINTR) ); #else - temp_write = this_write = send(sock,(char*) buf, count- bytes_sent,0); + this_write = send(sock,(char*) buf, count- bytes_sent,0); } while ( (this_write == SOCKET_ERROR) && (WSAGetLastError() == WSAEINTR) ); #endif if (this_write <= 0) diff --git a/teletextdecodervbiebu.cc b/teletextdecodervbiebu.cc index 0083469..0ea194f 100644 --- a/teletextdecodervbiebu.cc +++ b/teletextdecodervbiebu.cc @@ -274,7 +274,7 @@ void TeletextDecoderVBIEBU::DecodeTeletext(const UCHAR* buffer, unsigned int fie } int pagenumber=hdrbuf[1]; int pagemagazin=magazin<<8 | pagenumber; - int pagesubnumber=(hdrbuf[2]) || ((hdrbuf[3]<<8) & 0x3f7f); + // int pagesubnumber=(hdrbuf[2]) || ((hdrbuf[3]<<8) & 0x3f7f); if (pagemagazin == selectedpage) ourpage=true; else ourpage=false; diff --git a/vdr.cc b/vdr.cc index 28724a2..46f37b8 100644 --- a/vdr.cc +++ b/vdr.cc @@ -675,7 +675,7 @@ int VDR::doLogin(unsigned int* v_server_min, unsigned int* v_server_max, unsigne unsigned int numlangcodes = vresp->extractULONG(); subtitles = vresp->extractULONG(); list.clear(); - for (int i=0; iextractLONG(); newpref.subtitlepref = vresp->extractLONG(); @@ -1866,7 +1866,7 @@ ULONG VDR::loadTVMediaRecThumb(TVMediaInfo & media) VDR_RequestPacket vrp; if (!vrp.init(VDR_LOADTVMEDIARECTHUMB, false, 0)) return -1; - if (!vrp.addString(media.primary_name.c_str())) return NULL; + if (!vrp.addString(media.primary_name.c_str())) return -1; VDR_PacketReceiver* vdrpr = new VDR_PacketReceiver(); vdrpr->receiverChannel = VDR::CHANNEL_TVMEDIA; @@ -1888,8 +1888,8 @@ ULONG VDR::loadTVMediaEventThumb(TVMediaInfo & media) VDR_RequestPacket vrp; if (!vrp.init(VDR_LOADTVMEDIAEVENTTHUMB, false, 0)) return -1; - if (!vrp.addULONG(media.primary_id)) return NULL; - if (!vrp.addULONG(media.secondary_id)) return NULL; + if (!vrp.addULONG(media.primary_id)) return -1; + if (!vrp.addULONG(media.secondary_id)) return -1; VDR_PacketReceiver* vdrpr = new VDR_PacketReceiver(); vdrpr->receiverChannel = VDR::CHANNEL_TVMEDIA; @@ -1911,7 +1911,7 @@ ULONG VDR::loadChannelLogo(TVMediaInfo & media) VDR_RequestPacket vrp; if (!vrp.init(VDR_LOADCHANNELLOGO, false, 0)) return -1; - if (!vrp.addULONG(media.primary_id)) return NULL; + if (!vrp.addULONG(media.primary_id)) return -1; VDR_PacketReceiver* vdrpr = new VDR_PacketReceiver(); vdrpr->receiverChannel = VDR::CHANNEL_TVMEDIA; diff --git a/vepg.cc b/vepg.cc index a5babd0..6f2b800 100644 --- a/vepg.cc +++ b/vepg.cc @@ -323,7 +323,7 @@ void VEpg::drawData() // Not doing View::draw() every time causes // things not to be cleared off the surface properly // So, blank out the data area first - int screenwidth=Video::getInstance()->getScreenWidth(); + //int screenwidth=Video::getInstance()->getScreenWidth(); rectangle( chanListbox.getRootBoxOffsetX(), chanListbox.getRootBoxOffsetY() - getFontHeight() - 3, diff --git a/vepglistadvanced.cc b/vepglistadvanced.cc index 7a02a8d..22fb0a2 100644 --- a/vepglistadvanced.cc +++ b/vepglistadvanced.cc @@ -401,7 +401,7 @@ void VEpgListAdvanced::updateEpgDataNowNext(bool changeState) for(int listIndex = startupdate; listIndex < endupdate; listIndex++) { if (listIndex < 0) continue; - if (listIndex >= chanlistsize) continue; + if (listIndex >= (int)chanlistsize) continue; chan = (*chanList)[listIndex]; if (!eventLista[listIndex]) eventLista[listIndex] = VDR::getInstance()->getChannelSchedule(chan->number, now, 4 * 60 *60); diff --git a/vvideorec.cc b/vvideorec.cc index 7156053..3b0c879 100644 --- a/vvideorec.cc +++ b/vvideorec.cc @@ -708,7 +708,7 @@ void VVideoRec::doAudioSelector() ULONG mp_audcounter = 0; ULONG ac3_counter = 0; int dvb_subcounter = 1;*/ - int i; + ULONG i; /*unsigned char type; char* lang; diff --git a/wol.cc b/wol.cc index 0772d00..38f1244 100644 --- a/wol.cc +++ b/wol.cc @@ -155,13 +155,15 @@ int Wol::find_ether(char *name) /* Input an Ethernet address and convert to binary. */ int Wol::convertToBinary(char *bufp, unsigned char *addr) { - char c, *orig; + char c; +#ifdef DEBUG + char* orig = bufp; +#endif int i; - unsigned char *ptr = addr; + unsigned char *ptr = addr; unsigned val; i = 0; - orig = bufp; while ((*bufp != '\0') && (i < ETH_ALEN)) { val = 0; diff --git a/wpictureview.cc b/wpictureview.cc index 55a81f2..9922318 100644 --- a/wpictureview.cc +++ b/wpictureview.cc @@ -231,7 +231,7 @@ WActorGallery::WActorGallery(Actors& actors) WArtworkGallery::WArtworkGallery(MovieInfo& movie) { - float pixelaspect=Osd::getInstance()->getPixelAspect(); +// float pixelaspect=Osd::getInstance()->getPixelAspect(); addTVMedia(movie.fanart); addTVMedia(movie.collectionFanart); addTVMedia(movie.collectionPoster); diff --git a/wsymbol.cc b/wsymbol.cc index 99b0857..a5da064 100644 --- a/wsymbol.cc +++ b/wsymbol.cc @@ -1076,7 +1076,7 @@ void WSymbol::draw() int widthBits = widthBytes * 8; int sHeight = heights[nextSymbol]; - int x, y, bytesIn, bitsIn; +// int x, y, bytesIn, bitsIn; drawMonoBitmap(base,0,0,sHeight,widthBits, nextColour); /* startFastDraw(); diff --git a/wtvmedia.cc b/wtvmedia.cc index ca59b11..8e03805 100644 --- a/wtvmedia.cc +++ b/wtvmedia.cc @@ -58,6 +58,9 @@ case ZoomBoth: w = area.w; h = area.h; break; + + case NoZoom: + ; // ? } drawTVMedia(info,0.f,0.f,w,h,TopLeft); -- 2.39.2