Skip to content

F
freeswitch
提交 ddc578bc authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

use () around & ops to clarify order precedence 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@77 a93c3328-9c30-0410-af19-c9cd2b2d52af
上级 5356f273
显示空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 21 行删除
libs/openzap/src/isdn/Q931ie.c
浏览文件 @ ddc578bc
...@@ -453,7 +453,7 @@ L3INT Q931Uie_CallID(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * ...@@ -453,7 +453,7 @@ L3INT Q931Uie_CallID(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *
pie->CallId[x] = IBuf[Octet+Off] & 0x7f; pie->CallId[x] = IBuf[Octet+Off] & 0x7f;
Off++; Off++;
x++; x++;
}while(IBuf[Octet+Off]&0x80 != 0 && x < 10); }while((IBuf[Octet+Off]&0x80) != 0 && x < 10);
Q931IESizeTest(Q931E_CALLID); Q931IESizeTest(Q931E_CALLID);
...@@ -622,7 +622,7 @@ L3INT Q931Uie_CalledSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR ...@@ -622,7 +622,7 @@ L3INT Q931Uie_CalledSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
pie->Digit[x] = IBuf[Octet+Off] & 0x7f; pie->Digit[x] = IBuf[Octet+Off] & 0x7f;
Off++; Off++;
x++; x++;
}while(IBuf[Octet+Off]&0x80 != 0 && x < 20); }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);
Q931IESizeTest(Q931E_CALLEDSUB); Q931IESizeTest(Q931E_CALLEDSUB);
...@@ -805,7 +805,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA ...@@ -805,7 +805,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA
pie->NumPlanID = IBuf[Octet+Off] & 0x0f; pie->NumPlanID = IBuf[Octet+Off] & 0x0f;
/* Octet 3a */ /* Octet 3a */
if(IBuf[Octet+Off] & 0x80 != 0) if((IBuf[Octet+Off] & 0x80) != 0)
{ {
Off++; Off++;
pie->PresInd = (IBuf[Octet+Off] >> 5) & 0x03; pie->PresInd = (IBuf[Octet+Off] >> 5) & 0x03;
...@@ -819,7 +819,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA ...@@ -819,7 +819,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA
pie->Digit[x] = IBuf[Octet+Off] & 0x7f; pie->Digit[x] = IBuf[Octet+Off] & 0x7f;
Off++; Off++;
x++; x++;
}while(IBuf[Octet+Off]&0x80 != 0 && x < 20); }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);
Q931IESizeTest(Q931E_CALLINGNUM); Q931IESizeTest(Q931E_CALLINGNUM);
...@@ -925,7 +925,7 @@ L3INT Q931Uie_CallingSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR ...@@ -925,7 +925,7 @@ L3INT Q931Uie_CallingSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
pie->Digit[x] = IBuf[Octet+Off] & 0x7f; pie->Digit[x] = IBuf[Octet+Off] & 0x7f;
Off++; Off++;
x++; x++;
}while(IBuf[Octet+Off]&0x80 != 0 && x < 20); }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);
Q931IESizeTest(Q931E_CALLINGSUB); Q931IESizeTest(Q931E_CALLINGSUB);
...@@ -1013,7 +1013,7 @@ L3INT Q931Uie_Cause(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * O ...@@ -1013,7 +1013,7 @@ L3INT Q931Uie_Cause(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * O
pie->Location = IBuf[Octet+Off] & 0x0f; pie->Location = IBuf[Octet+Off] & 0x0f;
/* Octet 3a */ /* Octet 3a */
if(IBuf[Octet+Off] & 0x80 != 0) if((IBuf[Octet+Off] & 0x80) != 0)
{ {
Off++; Off++;
pie->Recom = IBuf[Octet+Off] & 0x7f; pie->Recom = IBuf[Octet+Off] & 0x7f;
...@@ -1764,7 +1764,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1764,7 +1764,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
Octet++; Octet++;
/* Octet 3a*/ /* Octet 3a*/
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->NegotInd = (IBuf[Octet+Off] >> 6) & 0x01; pie->NegotInd = (IBuf[Octet+Off] >> 6) & 0x01;
Off++; Off++;
...@@ -1784,7 +1784,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1784,7 +1784,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
} }
/* Octet 5 - Layer 1 Ident */ /* Octet 5 - Layer 1 Ident */
if(IBuf[Octet+Off] & 0x60 == 0x20) /* Layer 1 Ident ? */ if((IBuf[Octet+Off] & 0x60) == 0x20) /* Layer 1 Ident ? */
{ {
pie->Layer1Ident = (IBuf[Octet+Off] >> 5) & 0x03; pie->Layer1Ident = (IBuf[Octet+Off] >> 5) & 0x03;
pie->UIL1Prot = IBuf[Octet+Off] & 0x1f; pie->UIL1Prot = IBuf[Octet+Off] & 0x1f;
...@@ -1792,7 +1792,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1792,7 +1792,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
Octet++; Octet++;
/* Octet 5a */ /* Octet 5a */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->SyncAsync = (IBuf[Octet+Off] >> 6) & 0x01; pie->SyncAsync = (IBuf[Octet+Off] >> 6) & 0x01;
pie->Negot = (IBuf[Octet+Off] >> 5) & 0x01; pie->Negot = (IBuf[Octet+Off] >> 5) & 0x01;
...@@ -1800,7 +1800,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1800,7 +1800,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
Off++; Off++;
/* Octet 5b - 2 options */ /* Octet 5b - 2 options */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
if(pie->UIL1Prot == 0x01) /* V.110, I.460 and X.30*/ if(pie->UIL1Prot == 0x01) /* V.110, I.460 and X.30*/
{ {
...@@ -1833,7 +1833,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1833,7 +1833,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
} }
/* Octet 5c */ /* Octet 5c */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->NumStopBits=(IBuf[Octet+Off] >> 5) & 0x03; pie->NumStopBits=(IBuf[Octet+Off] >> 5) & 0x03;
pie->NumDataBits=(IBuf[Octet+Off] >> 3) & 0x03; pie->NumDataBits=(IBuf[Octet+Off] >> 3) & 0x03;
...@@ -1841,7 +1841,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1841,7 +1841,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
Off++; Off++;
/* Octet 5d */ /* Octet 5d */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->DuplexMode = (IBuf[Octet+Off] >> 6) & 0x01; pie->DuplexMode = (IBuf[Octet+Off] >> 6) & 0x01;
pie->ModemType = IBuf[Octet+Off] & 0x3f; pie->ModemType = IBuf[Octet+Off] & 0x3f;
...@@ -1854,14 +1854,14 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1854,14 +1854,14 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
} }
/* Octet 6 - Layer 2 Ident */ /* Octet 6 - Layer 2 Ident */
if(IBuf[Octet+Off] & 0x60 == 0x40) /* Layer 1 Ident ? */ if((IBuf[Octet+Off] & 0x60) == 0x40) /* Layer 1 Ident ? */
{ {
pie->Layer2Ident= (IBuf[Octet+Off] >>5) & 0x03; pie->Layer2Ident= (IBuf[Octet+Off] >>5) & 0x03;
pie->UIL2Prot = IBuf[Octet+Off] & 0x1f; pie->UIL2Prot = IBuf[Octet+Off] & 0x1f;
Octet++; Octet++;
/* Octet 6a */ /* Octet 6a */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
if(pie->UIL2Prot == 0x10) /* 2nd 6a */ if(pie->UIL2Prot == 0x10) /* 2nd 6a */
{ {
...@@ -1875,7 +1875,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1875,7 +1875,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
Off++; Off++;
} }
/* Octet 6b*/ /* Octet 6b*/
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->WindowSize = IBuf[Octet+Off] & 0x7f; pie->WindowSize = IBuf[Octet+Off] & 0x7f;
Off++; Off++;
...@@ -1884,14 +1884,14 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1884,14 +1884,14 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
} }
/* Octet 7 - layer 3 Ident */ /* Octet 7 - layer 3 Ident */
if(IBuf[Octet+Off] & 0x60 == 0x60) /* Layer 3 Ident ? */ if((IBuf[Octet+Off] & 0x60) == 0x60) /* Layer 3 Ident ? */
{ {
pie->Layer3Ident= (IBuf[Octet+Off] >> 5) & 0x03; pie->Layer3Ident= (IBuf[Octet+Off] >> 5) & 0x03;
pie->UIL3Prot = IBuf[Octet+Off] & 0x1f; pie->UIL3Prot = IBuf[Octet+Off] & 0x1f;
Octet++; Octet++;
/* Octet 7a */ /* Octet 7a */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
if(pie->UIL3Prot == 0x0b) if(pie->UIL3Prot == 0x0b)
...@@ -1915,13 +1915,13 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O ...@@ -1915,13 +1915,13 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
} }
/* Octet 7b*/ /* Octet 7b*/
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->DefPackSize = IBuf[Octet+Off] & 0x0f; pie->DefPackSize = IBuf[Octet+Off] & 0x0f;
Off++; Off++;
/* Octet 7c */ /* Octet 7c */
if(IBuf[Octet+Off-1] & 0x80 != 0) if((IBuf[Octet+Off-1] & 0x80) != 0)
{ {
pie->PackWinSize= IBuf[Octet+Off] & 0x7f; pie->PackWinSize= IBuf[Octet+Off] & 0x7f;
} }
......
libs/openzap/src/isdn/include/Q931.h
浏览文件 @ ddc578bc
...@@ -115,9 +115,8 @@ ...@@ -115,9 +115,8 @@
#ifdef _MSC_VER #ifdef _MSC_VER
/* warning C4244: conversion from 'type a' to 'type b', possible loss of data TODO: This one should not be disabled */ /* 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 C4189 : local variable is initialized but not referenced TODO: This one should not be disabled */
/* warning C4554: '&' : check operator precedence for possible error; use parentheses to clarify precedence 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 */ /* 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 4554 4267) #pragma warning(disable:4100 4244 4189 4267)
#endif #endif
/***************************************************************************** /*****************************************************************************
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论