diff options
author | Jochen Dolze <vdr@dolze.de> | 2010-03-23 15:32:37 +0100 |
---|---|---|
committer | Jochen Dolze <vdr@dolze.de> | 2010-03-23 15:32:37 +0100 |
commit | fc4a9599ab36029c94949cf6faeb21d63d79ed51 (patch) | |
tree | 310dadf189b647ab0ea7cc0d075c1fed48fe403a /queue.cpp | |
parent | 44b6d66ecd254cd82c1b37b1937479e5a895f57c (diff) | |
download | vdr-plugin-markad-fc4a9599ab36029c94949cf6faeb21d63d79ed51.tar.gz vdr-plugin-markad-fc4a9599ab36029c94949cf6faeb21d63d79ed51.tar.bz2 |
Fixed most warnings from -Wextra and -pedantic
Diffstat (limited to 'queue.cpp')
-rw-r--r-- | queue.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -33,7 +33,8 @@ bool cMarkAdPaketQueue::Inject(uchar *Data, int Size) if (!buffer) return false; if (outptr>Size) { - uchar temp[Size+1]; + uchar *temp=(uchar *) alloca(Size+1); + if (!temp) return false; memcpy(temp,Data,Size); outptr-=Size; memcpy(&buffer[outptr],temp,Size); @@ -42,12 +43,13 @@ bool cMarkAdPaketQueue::Inject(uchar *Data, int Size) else { int oldSize=Length(); - uchar tempold[oldSize+1]; - memcpy(tempold,&buffer[outptr],oldSize); + uchar *tempold=(uchar *) alloca(oldSize+1); + if (!tempold) return false; + uchar *temp=(uchar *) alloca(Size+1); + if (!temp) return false; - uchar temp[Size+1]; + memcpy(tempold,&buffer[outptr],oldSize); memcpy(temp,Data,Size); - memcpy(buffer,temp,Size); memcpy(buffer+Size,tempold,oldSize); @@ -72,7 +74,7 @@ bool cMarkAdPaketQueue::Put(uchar *Data, int Size) memcpy(&buffer[inptr],Data,Size); inptr+=Size; - int npercent=(int) ((double) inptr/(double) maxqueue)*100; + int npercent=(int) ((inptr*100)/maxqueue); if ((npercent>90) && (name) && (npercent!=percent)) { |