From f3d38eb8018d3ede097d860dd6bbd32674abbac1 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 18 Dec 2013 19:47:34 +0000 Subject: [PATCH] ooh323c: Fix gcc 4.6.3 compiler warnings. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@404212 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- addons/ooh323c/src/memheap.c | 3 +-- addons/ooh323c/src/ooCapability.c | 4 ---- addons/ooh323c/src/ooSocket.c | 6 +++--- addons/ooh323c/src/ooTimer.c | 3 +-- addons/ooh323c/src/ooq931.c | 8 +++----- addons/ooh323c/src/perutil.c | 3 +-- addons/ooh323cDriver.c | 5 ++++- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/addons/ooh323c/src/memheap.c b/addons/ooh323c/src/memheap.c index f92fa53842..c7aed04e52 100644 --- a/addons/ooh323c/src/memheap.c +++ b/addons/ooh323c/src/memheap.c @@ -726,7 +726,7 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) OSMemLink** ppMemLink; OSMemBlk* pMemBlk; OSMemElemDescr* pElem; - OSMemLink* pMemLink, *pPrevMemLink = 0; + OSMemLink* pMemLink; void *newMem_p; unsigned nbytes, nunits; @@ -758,7 +758,6 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) *(int*)(((char*)pMemLink) + sizeof (OSMemLink)) = nbytes_; return pMemLink->pMemBlk; } - pPrevMemLink = pMemLink; } /* Round number of bytes to nearest 8-byte boundary */ diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c index 18a25f3751..f3b8c50502 100644 --- a/addons/ooh323c/src/ooCapability.c +++ b/addons/ooh323c/src/ooCapability.c @@ -1104,14 +1104,12 @@ struct H245AudioCapability* ooCapabilityCreateNonStandardCapability (ooH323EpCapability *epCap, OOCTXT* pctxt, int dir) { H245AudioCapability *pAudio=NULL; - OOCapParams *params; if(!epCap || !epCap->params) { OOTRACEERR1("Error:Invalid capability parameters to " "ooCapabilityCreateSimpleCapability.\n"); return NULL; } - params =(OOCapParams*)epCap->params; pAudio = (H245AudioCapability*)memAlloc(pctxt, sizeof(H245AudioCapability)); if(!pAudio) @@ -1228,7 +1226,6 @@ struct H245DataApplicationCapability* ooCapabilityCreateT38Capability (ooH323EpCapability *epCap, OOCTXT* pctxt, int dir) { H245DataApplicationCapability *pT38=NULL; - OOCapParams *params; H245DataMode_application *pT38app; if(!epCap || !epCap->params) { @@ -1236,7 +1233,6 @@ struct H245DataApplicationCapability* ooCapabilityCreateT38Capability "ooCapabilityCreateSimpleCapability.\n"); return NULL; } - params =(OOCapParams*)epCap->params; pT38 = (H245DataApplicationCapability*)memAlloc(pctxt, sizeof(H245DataApplicationCapability)); if(!pT38) diff --git a/addons/ooh323c/src/ooSocket.c b/addons/ooh323c/src/ooSocket.c index b51ba5f2c0..f8179fee0e 100644 --- a/addons/ooh323c/src/ooSocket.c +++ b/addons/ooh323c/src/ooSocket.c @@ -234,7 +234,7 @@ int ooSocketCreate (OOSOCKET* psocket) int ooSocketCreateUDP (OOSOCKET* psocket) { int on; - struct linger linger; + /*struct linger linger;*/ OOSOCKET sock = socket (AF_INET, SOCK_DGRAM, @@ -252,9 +252,9 @@ int ooSocketCreateUDP (OOSOCKET* psocket) OOTRACEERR1("Error:Failed to set socket option SO_REUSEADDR\n"); return ASN_E_INVSOCKET; } - linger.l_onoff = 1; + /*linger.l_onoff = 1; linger.l_linger = 0; - /*if (setsockopt (sock, SOL_SOCKET, SO_LINGER, + if (setsockopt (sock, SOL_SOCKET, SO_LINGER, (const char* ) &linger, sizeof (linger)) == -1) return ASN_E_INVSOCKET; */ diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c index ad5f37f0aa..efb863ef47 100644 --- a/addons/ooh323c/src/ooTimer.c +++ b/addons/ooh323c/src/ooTimer.c @@ -101,7 +101,6 @@ OOBOOL ooTimerExpired (OOTimer* pTimer) void ooTimerFireExpired (OOCTXT* pctxt, DList *pList) { OOTimer* pTimer; - int stat; while (pList->count > 0) { pTimer = (OOTimer*) pList->head->data; @@ -113,7 +112,7 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList) */ if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer); - stat = (*pTimer->timeoutCB)(pTimer->cbData); + (*pTimer->timeoutCB)(pTimer->cbData); if (!pTimer->reRegister) { ooTimerDelete (pctxt, pList, pTimer); diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c index fd4aeee659..c3b1deac33 100644 --- a/addons/ooh323c/src/ooq931.c +++ b/addons/ooh323c/src/ooq931.c @@ -2183,7 +2183,7 @@ int ooH323HandleCallFwdRequest(OOH323CallData *call) ooAliases *pNewAlias=NULL, *alias=NULL; struct timespec ts; struct timeval tv; - int i=0, irand=0, ret = OO_OK; + int i=0, irand=0; /* Note: We keep same callToken, for new call which is going to replace an existing call, thus treating it as a single call.*/ @@ -2235,7 +2235,7 @@ int ooH323HandleCallFwdRequest(OOH323CallData *call) { /* No need to check registration status here as it is already checked for MakeCall command */ - ret = ooGkClientSendAdmissionRequest(gH323ep.gkClient, fwdedCall, FALSE); + ooGkClientSendAdmissionRequest(gH323ep.gkClient, fwdedCall, FALSE); fwdedCall->callState = OO_CALL_WAITING_ADMISSION; ast_mutex_lock(&fwdedCall->Lock); tv = ast_tvnow(); @@ -2249,7 +2249,7 @@ int ooH323HandleCallFwdRequest(OOH323CallData *call) } if (fwdedCall->callState < OO_CALL_CLEAR) { ast_mutex_lock(&fwdedCall->Lock); - ret = ooH323CallAdmitted (fwdedCall); + ooH323CallAdmitted (fwdedCall); ast_mutex_unlock(&fwdedCall->Lock); } @@ -2276,7 +2276,6 @@ int ooH323NewCall(char *callToken) { int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts) { - OOCTXT *pctxt; OOH323CallData *call; int ret=OO_OK, i=0, irand=0; char tmp[30]="\0"; @@ -2303,7 +2302,6 @@ int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts) return OO_FAILED; } - pctxt = call->pctxt; if(opts) { if(opts->fastStart) diff --git a/addons/ooh323c/src/perutil.c b/addons/ooh323c/src/perutil.c index c6a608ca7d..75368279a1 100644 --- a/addons/ooh323c/src/perutil.c +++ b/addons/ooh323c/src/perutil.c @@ -168,7 +168,7 @@ Asn1SizeCnst* getSizeConstraint (OOCTXT* pctxt, ASN1BOOL extbit) int checkSizeConstraint(OOCTXT* pctxt, int size) { Asn1SizeCnst* pSize; - ASN1UINT lower, upper; + ASN1UINT upper; ASN1BOOL extbit; int stat; @@ -186,7 +186,6 @@ int checkSizeConstraint(OOCTXT* pctxt, int size) pSize = getSizeConstraint (pctxt, extbit); - lower = (pSize) ? pSize->lower : 0; upper = (pSize) ? pSize->upper : ASN1UINT_MAX; if (upper < (ASN1UINT)size) { diff --git a/addons/ooh323cDriver.c b/addons/ooh323cDriver.c index ce156a50ff..3ce18823ab 100644 --- a/addons/ooh323cDriver.c +++ b/addons/ooh323cDriver.c @@ -100,8 +100,10 @@ void* ooh323c_call_thread(void* dummy) pfds[0].fd = mycthread->thePipe[0]; pfds[0].events = POLLIN; ooSocketPoll(pfds, 1, SEC_TO_HOLD_THREAD * 1000); - if (ooPDRead(pfds, 1, mycthread->thePipe[0])) + if (ooPDRead(pfds, 1, mycthread->thePipe[0])) { res = read(mycthread->thePipe[0], &c, 1); + (void) res;/* Shut up compiler: Set but not used and unused return value of read. */ + } ast_mutex_lock(&callThreadsLock); ast_mutex_lock(&mycthread->lock); @@ -182,6 +184,7 @@ int ooh323c_start_call_thread(ooCallData *call) { cur->inUse = TRUE; cur->call = call; res = write(cur->thePipe[1], &c, 1); + (void) res;/* Shut up compiler: Set but not used and unused return value of write. */ ast_mutex_unlock(&cur->lock); }