From 324e47342e9e54238ed6a7474b899ab87b3fd821 Mon Sep 17 00:00:00 2001 From: Alexandr Anikin Date: Wed, 4 Jul 2012 18:46:56 +0000 Subject: Fix modern gcc warning Review: https://reviewboard.asterisk.org/r/1767 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369602 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- addons/ooh323c/src/decode.c | 4 ++-- addons/ooh323c/src/ooCapability.c | 8 ++++---- addons/ooh323c/src/ooSocket.c | 5 +++-- addons/ooh323c/src/ooTimer.c | 3 --- addons/ooh323c/src/ooq931.c | 8 +++----- addons/ooh323c/src/perutil.c | 3 +-- 6 files changed, 13 insertions(+), 18 deletions(-) (limited to 'addons/ooh323c/src') diff --git a/addons/ooh323c/src/decode.c b/addons/ooh323c/src/decode.c index 643901e7d..3d7fc04c8 100644 --- a/addons/ooh323c/src/decode.c +++ b/addons/ooh323c/src/decode.c @@ -425,7 +425,7 @@ int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr) if (pctxt->flags & ASN1FASTCOPY) { /* check is it possible to do optimized decoding */ - ASN1OCTET bit; + ASN1OCTET bit = 0; ASN1UINT byteIndex = pctxt->buffer.byteIndex; /* save byte index */ ASN1USINT bitOffset = pctxt->buffer.bitOffset; /* save bit offset */ @@ -499,7 +499,7 @@ int decodeDynOctetString (OOCTXT* pctxt, ASN1DynOctStr* pOctStr) if (pctxt->flags & ASN1FASTCOPY) { /* check if it is possible to do optimized decoding */ - ASN1OCTET bit; + ASN1OCTET bit = 0; ASN1UINT byteIndex = pctxt->buffer.byteIndex; /* save byte index */ ASN1USINT bitOffset = pctxt->buffer.bitOffset; /* save bit offset */ diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c index 18a25f375..08607f3ed 100644 --- a/addons/ooh323c/src/ooCapability.c +++ b/addons/ooh323c/src/ooCapability.c @@ -1104,14 +1104,14 @@ 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,15 +1228,15 @@ struct H245DataApplicationCapability* ooCapabilityCreateT38Capability (ooH323EpCapability *epCap, OOCTXT* pctxt, int dir) { H245DataApplicationCapability *pT38=NULL; - OOCapParams *params; H245DataMode_application *pT38app; + if(!epCap || !epCap->params) { OOTRACEERR1("Error:Invalid capability parameters to " "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 9349700da..ee02f5206 100644 --- a/addons/ooh323c/src/ooSocket.c +++ b/addons/ooh323c/src/ooSocket.c @@ -249,7 +249,6 @@ int ooSocketCreate (OOSOCKET* psocket, int family) int ooSocketCreateUDP (OOSOCKET* psocket, int family) { int on; - struct linger linger; OOSOCKET sock; if (family == 6) @@ -273,9 +272,11 @@ int ooSocketCreateUDP (OOSOCKET* psocket, int family) OOTRACEERR1("Error:Failed to set socket option SO_REUSEADDR\n"); return ASN_E_INVSOCKET; } + // may be will use later + /* 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 ad5f37f0a..56d76f3af 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,8 +112,6 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList) */ if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer); - stat = (*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 fb9526915..d4cfb6544 100644 --- a/addons/ooh323c/src/ooq931.c +++ b/addons/ooh323c/src/ooq931.c @@ -2239,7 +2239,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.*/ @@ -2291,7 +2291,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(); @@ -2305,7 +2305,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); } @@ -2332,7 +2332,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[2+8*4+7]="\0"; @@ -2360,7 +2359,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 c6a608ca7..75368279a 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) { -- cgit v1.2.3