commit 543c3eaa46434a7e3974012c4d33ed82fc81fd33
author kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Nov 23 12:20:35 2011 +0000
committer kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Nov 23 12:20:35 2011 +0000
tree 11c3ea5256d2ac14710c931a4c8f874f76084686
parent 89ab652250f092a1447bad97f6f6cd82828995ea

Fixing Release compilation errors

Review URL: http://webrtc-codereview.appspot.com/267026

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1000 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/audio_coding/main/test/RTPFile.cpp

diff --git a/src/modules/audio_coding/main/test/RTPFile.cpp b/src/modules/audio_coding/main/test/RTPFile.cpp
index 23d78d7..04648be 100644
--- a/src/modules/audio_coding/main/test/RTPFile.cpp
+++ b/src/modules/audio_coding/main/test/RTPFile.cpp
@@ -9,8 +9,7 @@
  */
 
 #include "RTPFile.h"
-#include "rw_lock_wrapper.h"
-#include "engine_configurations.h"
+
 #include <stdlib.h>
 
 #ifdef WIN32
@@ -20,6 +19,9 @@
 #endif
 
 #include "audio_coding_module.h"
+#include "engine_configurations.h"
+#include "gtest/gtest.h"
+#include "rw_lock_wrapper.h"
 
 void RTPStream::ParseRTPHeader(WebRtcRTPHeader* rtpInfo, const WebRtc_UWord8* rtpHeader)
 {
@@ -186,16 +188,16 @@
     WebRtc_UWord32 start_sec, start_usec, source;
     WebRtc_UWord16 port, padding;
     char fileHeader[40];
-    fgets(fileHeader, 40, _rtpFile);
-    fread(&start_sec, 4, 1, _rtpFile);
+    EXPECT_TRUE(fgets(fileHeader, 40, _rtpFile) != 0);
+    EXPECT_GT(fread(&start_sec, 4, 1, _rtpFile), 0u);
     start_sec=ntohl(start_sec);
-    fread(&start_usec, 4, 1, _rtpFile);
+    EXPECT_GT(fread(&start_usec, 4, 1, _rtpFile), 0u);
     start_usec=ntohl(start_usec);
-    fread(&source, 4, 1, _rtpFile);
+    EXPECT_GT(fread(&source, 4, 1, _rtpFile), 0u);
     source=ntohl(source);
-    fread(&port, 2, 1, _rtpFile);
+    EXPECT_GT(fread(&port, 2, 1, _rtpFile), 0u);
     port=ntohs(port);
-    fread(&padding, 2, 1, _rtpFile);
+    EXPECT_GT(fread(&padding, 2, 1, _rtpFile), 0u);
     padding=ntohs(padding);
 }
 
@@ -237,19 +239,19 @@
     WebRtc_UWord16 lengthBytes;
     WebRtc_UWord16 plen;
     WebRtc_UWord8 rtpHeader[12];
-    fread(&lengthBytes, 2, 1, _rtpFile);
+    EXPECT_GT(fread(&lengthBytes, 2, 1, _rtpFile), 0u);
     if (feof(_rtpFile))
     {
         _rtpEOF = true;
         return 0;
     }
-    fread(&plen, 2, 1, _rtpFile);
+    EXPECT_GT(fread(&plen, 2, 1, _rtpFile), 0u);
     if (feof(_rtpFile))
     {
         _rtpEOF = true;
         return 0;
     }
-    fread(offset, 4, 1, _rtpFile);
+    EXPECT_GT(fread(offset, 4, 1, _rtpFile), 0u);
     if (feof(_rtpFile))
     {
         _rtpEOF = true;
@@ -263,7 +265,7 @@
         throw "Unable to read RTP file";
         exit(1);
     }
-    fread(rtpHeader, 12, 1, _rtpFile);
+    EXPECT_GT(fread(rtpHeader, 12, 1, _rtpFile), 0u);
     if (feof(_rtpFile))
     {
         _rtpEOF = true;
@@ -287,7 +289,7 @@
         exit(1);
     }
     lengthBytes -= 20;
-    fread(payloadData, 1, lengthBytes, _rtpFile);
+    EXPECT_GT(fread(payloadData, 1, lengthBytes, _rtpFile), 0u);
     if (feof(_rtpFile))
     {
         _rtpEOF = true;