[svn-commits] may: trunk r369602 - in /trunk/addons: ./ ooh323c/src/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jul 4 13:47:02 CDT 2012
Author: may
Date: Wed Jul 4 13:46:56 2012
New Revision: 369602
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369602
Log:
Fix modern gcc warning
Review: https://reviewboard.asterisk.org/r/1767
Modified:
trunk/addons/ooh323c/src/decode.c
trunk/addons/ooh323c/src/ooCapability.c
trunk/addons/ooh323c/src/ooSocket.c
trunk/addons/ooh323c/src/ooTimer.c
trunk/addons/ooh323c/src/ooq931.c
trunk/addons/ooh323c/src/perutil.c
trunk/addons/ooh323cDriver.c
Modified: trunk/addons/ooh323c/src/decode.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/decode.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323c/src/decode.c (original)
+++ trunk/addons/ooh323c/src/decode.c Wed Jul 4 13:46:56 2012
@@ -425,7 +425,7 @@
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 @@
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 */
Modified: trunk/addons/ooh323c/src/ooCapability.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooCapability.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323c/src/ooCapability.c (original)
+++ trunk/addons/ooh323c/src/ooCapability.c Wed Jul 4 13:46:56 2012
@@ -1104,14 +1104,14 @@
(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 @@
(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)
Modified: trunk/addons/ooh323c/src/ooSocket.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooSocket.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323c/src/ooSocket.c (original)
+++ trunk/addons/ooh323c/src/ooSocket.c Wed Jul 4 13:46:56 2012
@@ -249,7 +249,6 @@
int ooSocketCreateUDP (OOSOCKET* psocket, int family)
{
int on;
- struct linger linger;
OOSOCKET sock;
if (family == 6)
@@ -273,9 +272,11 @@
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;
*/
Modified: trunk/addons/ooh323c/src/ooTimer.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooTimer.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323c/src/ooTimer.c (original)
+++ trunk/addons/ooh323c/src/ooTimer.c Wed Jul 4 13:46:56 2012
@@ -101,7 +101,6 @@
void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
{
OOTimer* pTimer;
- int stat;
while (pList->count > 0) {
pTimer = (OOTimer*) pList->head->data;
@@ -112,8 +111,6 @@
* a long duration callback.
*/
if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer);
-
- stat = (*pTimer->timeoutCB)(pTimer->cbData);
if (!pTimer->reRegister) {
ooTimerDelete (pctxt, pList, pTimer);
Modified: trunk/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooq931.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323c/src/ooq931.c (original)
+++ trunk/addons/ooh323c/src/ooq931.c Wed Jul 4 13:46:56 2012
@@ -2239,7 +2239,7 @@
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 @@
{
/* 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 @@
}
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 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 @@
return OO_FAILED;
}
- pctxt = call->pctxt;
if(opts)
{
if(opts->fastStart)
Modified: trunk/addons/ooh323c/src/perutil.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/perutil.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323c/src/perutil.c (original)
+++ trunk/addons/ooh323c/src/perutil.c Wed Jul 4 13:46:56 2012
@@ -168,7 +168,7 @@
int checkSizeConstraint(OOCTXT* pctxt, int size)
{
Asn1SizeCnst* pSize;
- ASN1UINT lower, upper;
+ ASN1UINT upper;
ASN1BOOL extbit;
int stat;
@@ -186,7 +186,6 @@
pSize = getSizeConstraint (pctxt, extbit);
- lower = (pSize) ? pSize->lower : 0;
upper = (pSize) ? pSize->upper : ASN1UINT_MAX;
if (upper < (ASN1UINT)size) {
Modified: trunk/addons/ooh323cDriver.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323cDriver.c?view=diff&rev=369602&r1=369601&r2=369602
==============================================================================
--- trunk/addons/ooh323cDriver.c (original)
+++ trunk/addons/ooh323cDriver.c Wed Jul 4 13:46:56 2012
@@ -82,7 +82,7 @@
struct callthread* mycthread = (struct callthread *)dummy;
struct pollfd pfds[1];
char c;
- int res;
+ int res = 0;
do {
@@ -114,7 +114,7 @@
ast_mutex_unlock(&mycthread->lock);
ast_mutex_unlock(&callThreadsLock);
- } while (mycthread->call != NULL);
+ } while (mycthread->call != NULL && res == 0);
ast_mutex_destroy(&mycthread->lock);
@@ -129,7 +129,6 @@
int ooh323c_start_call_thread(ooCallData *call) {
char c = 'c';
- int res;
struct callthread *cur = callThreads;
ast_mutex_lock(&callThreadsLock);
@@ -138,9 +137,11 @@
}
ast_mutex_unlock(&callThreadsLock);
- if (cur != NULL && cur->inUse) {
+ if (cur != NULL) {
+ if (cur->inUse || write(cur->thePipe[1], &c, 1) < 0) {
ast_mutex_unlock(&cur->lock);
cur = NULL;
+ }
}
/* make new thread */
@@ -181,7 +182,6 @@
ast_debug(1,"using existing call thread for call %s\n", call->callToken);
cur->inUse = TRUE;
cur->call = call;
- res = write(cur->thePipe[1], &c, 1);
ast_mutex_unlock(&cur->lock);
}
More information about the svn-commits
mailing list