From 1e100a9a5e5e070e63cc701f2775f86a3adfe645 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Tue, 11 Sep 2012 09:23:32 +0000 Subject: [PATCH] Removing WebRtcNetEQ_GetVersion We no longer use version functions. This should resolve Coverity DefectId 14108 BUG=Coverity DefectId 14108 TEST=trybots, neteq_unittests, audio_coding_unittests, audio_coding_module_test Review URL: https://webrtc-codereview.appspot.com/792004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2736 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/neteq/interface/webrtc_neteq.h | 1 - .../audio_coding/neteq/test/NetEqRTPplay.cc | 11 +---------- src/modules/audio_coding/neteq/webrtc_neteq.c | 15 +-------------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/modules/audio_coding/neteq/interface/webrtc_neteq.h b/src/modules/audio_coding/neteq/interface/webrtc_neteq.h index aacfaebb97..39f6595fd0 100644 --- a/src/modules/audio_coding/neteq/interface/webrtc_neteq.h +++ b/src/modules/audio_coding/neteq/interface/webrtc_neteq.h @@ -163,7 +163,6 @@ typedef struct /* Info functions */ #define WEBRTC_NETEQ_MAX_ERROR_NAME 40 -int WebRtcNetEQ_GetVersion(char *version); int WebRtcNetEQ_GetErrorCode(void *inst); int WebRtcNetEQ_GetErrorName(int errorCode, char *errorName, int maxStrLen); diff --git a/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc index cb03baf47b..7811be3f80 100644 --- a/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc +++ b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc @@ -153,7 +153,6 @@ WebRtc_UWord32 simClock=0; int main(int argc, char* argv[]) { std::vector NetEQvector; - char version[20]; enum WebRtcNetEQDecoder usedCodec[kDecoderReservedEnd-1]; int noOfCodecs; @@ -187,9 +186,6 @@ int main(int argc, char* argv[]) bool dummyRtp = false; bool noDecode = false; - /* get the version string */ - WebRtcNetEQ_GetVersion(version); - printf("\n\nNetEq version: %s\n", version); #ifdef DEF_BUILD_DATE printf("Build time: %s\n", __BUILD_DATE); #endif @@ -1578,7 +1574,6 @@ void free_coders(std::map & decoders) int doAPItest() { - char version[20]; void *inst; enum WebRtcNetEQDecoder usedCodec; int NetEqBufferMaxPackets, BufferSizeInBytes; @@ -1588,11 +1583,7 @@ int doAPItest() { int memorySize; int ok; - printf("API-test:\n"); - - /* get the version string */ - WebRtcNetEQ_GetVersion(version); - printf("NetEq version: %s\n\n", version); + printf("API-test:\n\n"); /* test that API functions return -1 if instance is NULL */ #define CHECK_MINUS_ONE(x) {int errCode = x; if((errCode)!=-1){printf("\n API test failed at line %d: %s. Function did not return -1 as expected\n",__LINE__,#x); return(-1);}} diff --git a/src/modules/audio_coding/neteq/webrtc_neteq.c b/src/modules/audio_coding/neteq/webrtc_neteq.c index 707c756b46..776f61f096 100644 --- a/src/modules/audio_coding/neteq/webrtc_neteq.c +++ b/src/modules/audio_coding/neteq/webrtc_neteq.c @@ -56,22 +56,9 @@ int WebRtcNetEQ_strncpy(char *strDest, int numberOfElements, */ /***************************************** - * Info functions + * Error functions */ -int WebRtcNetEQ_GetVersion(char *version) -{ - char versionString[] = "3.3.0\0 "; - char endChar[] = " "; - int i = 0; - while ((versionString[i] != endChar[0]) && (i <= 20)) - { - version[i] = versionString[i]; /* To avoid using strcpy */ - i++; - } - return (0); -} - int WebRtcNetEQ_GetErrorCode(void *inst) { MainInst_t *NetEqMainInst = (MainInst_t*) inst;