From fc4a9599ab36029c94949cf6faeb21d63d79ed51 Mon Sep 17 00:00:00 2001 From: Jochen Dolze Date: Tue, 23 Mar 2010 15:32:37 +0100 Subject: Fixed most warnings from -Wextra and -pedantic --- queue.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'queue.cpp') diff --git a/queue.cpp b/queue.cpp index 611606d..3f5684f 100644 --- a/queue.cpp +++ b/queue.cpp @@ -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)) { -- cgit v1.2.3