diff --git a/libs/openzap/src/isdn/Q931StateTE.c b/libs/openzap/src/isdn/Q931StateTE.c
index c1a51ab649..7e870224a8 100644
--- a/libs/openzap/src/isdn/Q931StateTE.c
+++ b/libs/openzap/src/isdn/Q931StateTE.c
@@ -779,7 +779,7 @@ L3INT Q931ProcReleaseCompleteTE(Q931_TrunkInfo *pTrunk, L3UCHAR * buf, L3INT iFr
{
/* no action */
}
- return 0;
+ return ret;
}
/*****************************************************************************
diff --git a/libs/openzap/src/isdn/Q931ie.c b/libs/openzap/src/isdn/Q931ie.c
index fe649f56a7..a36eca1261 100644
--- a/libs/openzap/src/isdn/Q931ie.c
+++ b/libs/openzap/src/isdn/Q931ie.c
@@ -1121,7 +1121,7 @@ L3INT Q931Pie_CongLevel(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
{
Q931ie_CongLevel * pIE = (Q931ie_CongLevel*)IBuf;
L3INT rc=0;
- L3INT Beg=*Octet;
+ /* L3INT Beg=*Octet; */
OBuf[(*Octet)++] = Q931ie_CONGESTION_LEVEL | pIE->CongLevel;
@@ -2429,7 +2429,7 @@ L3INT Q931Pie_RepeatInd(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
{
Q931ie_RepeatInd * pIE = (Q931ie_RepeatInd*)IBuf;
L3INT rc=0;
- L3INT Beg=*Octet;
+ /* L3INT Beg=*Octet; */
OBuf[(*Octet)++] = Q931ie_REPEAT_INDICATOR | pIE->RepeatInd;
@@ -2687,9 +2687,9 @@ L3INT Q931Uie_SendComplete(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCH
*****************************************************************************/
L3INT Q931Pie_SendComplete(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT *Octet)
{
- Q931ie_SendComplete * pIE = (Q931ie_SendComplete*)IBuf;
+ /* Q931ie_SendComplete * pIE = (Q931ie_SendComplete*)IBuf; */
L3INT rc=Q931E_NO_ERROR;
- L3INT Beg=*Octet;
+ /* L3INT Beg=*Octet; */
OBuf[(*Octet)++] = 0x80 | (L3UCHAR)Q931ie_SENDING_COMPLETE;
diff --git a/libs/openzap/src/isdn/Q931mes.c b/libs/openzap/src/isdn/Q931mes.c
index c536d94799..21dd181616 100644
--- a/libs/openzap/src/isdn/Q931mes.c
+++ b/libs/openzap/src/isdn/Q931mes.c
@@ -51,8 +51,8 @@
L3INT Q931Umes_Alerting(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Alerting *mes = (Q931mes_Alerting*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -161,8 +161,8 @@ L3INT Q931Pmes_Alerting(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3INT ISize, L3UCH
*****************************************************************************/
L3INT Q931Umes_CallProceeding(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_CallProceeding *mes = (Q931mes_CallProceeding*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -291,8 +291,8 @@ L3INT Q931Pmes_CongestionControl(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3INT ISi
*****************************************************************************/
L3INT Q931Umes_Connect(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Connect *mes = (Q931mes_Connect*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -420,8 +420,8 @@ L3INT Q931Pmes_Connect(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCH
*****************************************************************************/
L3INT Q931Umes_ConnectAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_ConnectAck *mes = (Q931mes_ConnectAck*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -489,8 +489,8 @@ L3INT Q931Pmes_ConnectAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/
L3INT Q931Umes_Disconnect(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Disconnect *mes = (Q931mes_Disconnect*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -576,8 +576,8 @@ L3INT Q931Pmes_Disconnect(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/
L3INT Q931Umes_Information(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Information *mes = (Q931mes_Information*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -671,8 +671,8 @@ L3INT Q931Pmes_Information(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L
*****************************************************************************/
L3INT Q931Umes_Notify(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Notify *mes = (Q931mes_Notify*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -744,8 +744,8 @@ L3INT Q931Pmes_Notify(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHA
*****************************************************************************/
L3INT Q931Umes_Progress(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Progress *mes = (Q931mes_Progress*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -840,8 +840,8 @@ L3INT Q931Pmes_Progress(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UC
*****************************************************************************/
L3INT Q931Umes_Release(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Release *mes = (Q931mes_Release*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -915,8 +915,8 @@ L3INT Q931Pmes_Release(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCH
*****************************************************************************/
L3INT Q931Umes_ReleaseComplete(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_ReleaseComplete *mes = (Q931mes_ReleaseComplete*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1050,8 +1050,8 @@ L3INT Q931Pmes_RestartAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/
L3INT Q931Umes_Resume(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Resume *mes = (Q931mes_Resume*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1107,8 +1107,8 @@ L3INT Q931Pmes_Resume(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHA
*****************************************************************************/
L3INT Q931Umes_ResumeAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_ResumeAck *mes = (Q931mes_ResumeAck*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1174,8 +1174,8 @@ L3INT Q931Pmes_ResumeAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3U
*****************************************************************************/
L3INT Q931Umes_ResumeReject(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_ResumeReject *mes = (Q931mes_ResumeReject*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1255,7 +1255,7 @@ L3INT Q931Pmes_Segment(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCH
*****************************************************************************/
L3INT Q931Umes_Setup(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
+ /* L3INT i = IOff; */
L3INT ir=0;
L3INT OOff=0;
Q931mes_Setup *mes = (Q931mes_Setup*)OBuf;
@@ -1504,8 +1504,8 @@ L3INT Q931Pmes_Setup(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR
*****************************************************************************/
L3INT Q931Umes_SetupAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_SetupAck *mes = (Q931mes_SetupAck*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1591,8 +1591,8 @@ L3INT Q931Pmes_SetupAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UC
*****************************************************************************/
L3INT Q931Umes_Status(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Status *mes = (Q931mes_Status*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1667,8 +1667,8 @@ L3INT Q931Pmes_Status(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHA
*****************************************************************************/
L3INT Q931Umes_StatusEnquiry(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_StatusEnquiry *mes = (Q931mes_StatusEnquiry*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1724,8 +1724,8 @@ L3INT Q931Pmes_StatusEnquiry(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize,
*****************************************************************************/
L3INT Q931Umes_Suspend(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_Suspend *mes = (Q931mes_Suspend*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1781,8 +1781,8 @@ L3INT Q931Pmes_Suspend(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCH
*****************************************************************************/
L3INT Q931Umes_SuspendAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_SuspendAck *mes = (Q931mes_SuspendAck*)OBuf;
L3INT rc=Q931E_NO_ERROR;
@@ -1839,8 +1839,8 @@ L3INT Q931Pmes_SuspendAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/
L3INT Q931Umes_SuspendReject(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q931mes_SuspendReject *mes = (Q931mes_SuspendReject*)OBuf;
L3INT rc=Q931E_NO_ERROR;
diff --git a/libs/openzap/src/isdn/Q932mes.c b/libs/openzap/src/isdn/Q932mes.c
index a404018fa7..97e4fe1a42 100644
--- a/libs/openzap/src/isdn/Q932mes.c
+++ b/libs/openzap/src/isdn/Q932mes.c
@@ -45,8 +45,8 @@
L3INT Q932Umes_Facility(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_Facility *mes = (Q932mes_Facility*)IBuf;
@@ -79,8 +79,8 @@ L3INT Q932Pmes_Facility(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UC
L3INT Q932Umes_Hold(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_Hold *mes = (Q932mes_Hold*)IBuf;
@@ -113,8 +113,8 @@ L3INT Q932Pmes_Hold(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR
L3INT Q932Umes_HoldAck(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_HoldAck *mes = (Q932mes_HoldAck*)IBuf;
@@ -147,8 +147,8 @@ L3INT Q932Pmes_HoldAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCH
L3INT Q932Umes_HoldReject(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_HoldReject *mes = (Q932mes_HoldReject*)IBuf;
@@ -181,8 +181,8 @@ L3INT Q932Pmes_HoldReject(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
L3INT Q932Umes_Register(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_Register *mes = (Q932mes_Register*)IBuf;
@@ -215,8 +215,8 @@ L3INT Q932Pmes_Register(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UC
L3INT Q932Umes_Retrieve(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_Retrieve *mes = (Q932mes_Retrieve*)IBuf;
@@ -249,8 +249,8 @@ L3INT Q932Pmes_Retrieve(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UC
L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_RetrieveAck *mes = (Q932mes_RetrieveAck*)IBuf;
@@ -283,8 +283,8 @@ L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L
L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size)
{
- L3INT i = IOff;
- L3INT ir=0;
+ /* L3INT i = IOff; */
+ /* L3INT ir=0; */
L3INT OOff=0;
Q932mes_RetrieveReject *mes = (Q932mes_RetrieveReject*)IBuf;
diff --git a/libs/openzap/src/isdn/include/Q931.h b/libs/openzap/src/isdn/include/Q931.h
index 79f5ac9f00..813f4a9bc8 100644
--- a/libs/openzap/src/isdn/include/Q931.h
+++ b/libs/openzap/src/isdn/include/Q931.h
@@ -114,9 +114,8 @@
#ifdef _MSC_VER
/* warning C4244: conversion from 'type a' to 'type b', possible loss of data TODO: This one should not be disabled */
-/* warning C4189 : local variable is initialized but not referenced TODO: This one should not be disabled */
/* warning C4267: '=' : conversion from 'size_t' to 'unsigned char', possible loss of data TODO: This one should not be disabled */
-#pragma warning(disable:4100 4244 4189 4267)
+#pragma warning(disable:4100 4244 4267)
#endif
/*****************************************************************************