resolve msvc warning C4244

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@82 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/isdn/Q931ie.c b/libs/freetdm/src/isdn/Q931ie.c
index d10e5cdfc338ce65374ff2e54dbd5ffd2fe22491..642783e75c8e34235b60fa99535e21c496156429 100644 (file)
--- a/libs/freetdm/src/isdn/Q931ie.c
+++ b/libs/freetdm/src/isdn/Q931ie.c
@@ -410,7 +410,7 @@ L3INT Q931Pie_BearerCap(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
         }\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -459,7 +459,7 @@ L3INT Q931Uie_CallID(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_CallID) + x -1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_CallID) + x -1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_CallID) + x -1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -497,7 +497,7 @@ L3INT Q931Pie_CallID(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
 \r
     OBuf[(*Octet)-1] |= 0x80; /* set complete flag at last octet*/\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -574,7 +574,7 @@ L3INT Q931Pie_CallState(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
 \r
     OBuf[(*Octet)++] = 0x80 | (pIE->CodStand<<6) | pIE->CallState;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -628,7 +628,7 @@ L3INT Q931Uie_CalledSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_CalledSub) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_CalledSub) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_CalledSub) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -670,7 +670,7 @@ L3INT Q931Pie_CalledSub(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
 \r
     OBuf[(*Octet)-1] |= 0x80; /* Terminate bit */\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -721,7 +721,7 @@ L3INT Q931Uie_CalledNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_CalledNum) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_CalledNum) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_CalledNum) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -763,7 +763,7 @@ L3INT Q931Pie_CalledNum(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
 \r
     OBuf[(*Octet)-1] |= 0x80; /* Terminate bit */\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -825,7 +825,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_CallingNum) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_CallingNum) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_CallingNum) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -877,7 +877,7 @@ L3INT Q931Pie_CallingNum(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L
 \r
     OBuf[(*Octet)-1] |= 0x80; /* Terminate bit */\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -931,7 +931,7 @@ L3INT Q931Uie_CallingSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_CallingSub) + x -1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_CallingSub) + x -1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_CallingSub) + x -1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -973,7 +973,7 @@ L3INT Q931Pie_CallingSub(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L
 \r
     OBuf[(*Octet)-1] |= 0x80; /* Terminate bit */\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -1065,7 +1065,7 @@ L3INT Q931Pie_Cause(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
 \r
     /* Octet 5 - diagnostics not supported in send */\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -1261,7 +1261,7 @@ L3INT Q931Pie_ChanID(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
         }\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -1304,7 +1304,7 @@ L3USHORT Q931Uie_CRV(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
     else if(l==2) /* two octet CRV */\r
     {\r
         CRV = IBuf[Octet] << 8;\r
-        CRV += IBuf[Octet+1];\r
+        CRV = CRV + IBuf[Octet+1];\r
         Octet += 2;\r
     }\r
     else\r
@@ -1435,7 +1435,7 @@ L3INT Q931Pie_DateTime(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
         }\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -1480,7 +1480,7 @@ L3INT Q931Uie_Display(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_Display) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_Display) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_Display) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -1518,7 +1518,7 @@ L3INT Q931Pie_Display(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3IN
         OBuf[(*Octet)++] = pIE->Display[x];\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -1639,7 +1639,7 @@ L3INT Q931Pie_HLComp(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
         OBuf[(*Octet)-1] |= 0x80;\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -1684,7 +1684,7 @@ L3INT Q931Uie_KeypadFac(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_KeypadFac) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_KeypadFac) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_KeypadFac) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -1721,7 +1721,7 @@ L3INT Q931Pie_KeypadFac(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3
         OBuf[(*Octet)++] = pIE->KeypadFac[x];\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2102,7 +2102,7 @@ L3INT Q931Pie_LLComp(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
         rc = Q931E_LLCOMP;\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2165,7 +2165,7 @@ L3INT Q931Uie_NetFac(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_NetFac) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_NetFac) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_NetFac) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -2212,7 +2212,7 @@ L3INT Q931Pie_NetFac(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
     /* Octet 4*/\r
     OBuf[(*Octet)++] = pIE->NetFac;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2288,7 +2288,7 @@ L3INT Q931Pie_NotifInd(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
     /* Octet 3*/\r
     OBuf[(*Octet)++] = pIE->Notification;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2373,7 +2373,7 @@ L3INT Q931Pie_ProgInd(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3IN
     /* Octet 4*/\r
     OBuf[(*Octet)++] = 0x80 | pIE->ProgDesc;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2553,7 +2553,7 @@ L3INT Q931Pie_RestartInd(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L
     /* Octet 3*/\r
     OBuf[(*Octet)++] = 0x80 | pIE->Class ;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2635,7 +2635,7 @@ L3INT Q931Pie_Segment(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3IN
     /* Octet 4 */\r
     OBuf[(*Octet)++] = pIE->SegType;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2766,7 +2766,7 @@ L3INT Q931Pie_Signal(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
     /* Octet 3*/\r
     OBuf[(*Octet)++] = pIE->Signal;\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2817,7 +2817,7 @@ L3INT Q931Uie_TransNetSel(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHA
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_TransNetSel) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_TransNetSel) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_TransNetSel) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -2857,7 +2857,7 @@ L3INT Q931Pie_TransNetSel(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
         OBuf[(*Octet)++] = pIE->NetID[x];\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r
@@ -2906,7 +2906,7 @@ L3INT Q931Uie_UserUser(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *
 \r
     *IOff = (*IOff) + Octet + Off;\r
     *OOff = (*OOff) + sizeof(Q931ie_UserUser) + x - 1;\r
-    pie->Size = (L3UCHAR)sizeof(Q931ie_UserUser) + x - 1;\r
+    pie->Size = (L3UCHAR)(sizeof(Q931ie_UserUser) + x - 1);\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r
@@ -2946,7 +2946,7 @@ L3INT Q931Pie_UserUser(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
         OBuf[(*Octet)++] = pIE->User[x];\r
     }\r
 \r
-    OBuf[li] = (*Octet)-Beg;\r
+    OBuf[li] = (L3UCHAR)((*Octet)-Beg);\r
     return rc;\r
 }\r
 \r

diff --git a/libs/freetdm/src/isdn/include/Q931.h b/libs/freetdm/src/isdn/include/Q931.h
index ed1471494d55cb65637d86959f38e9bef61b3c60..04697bedc512b4b0a28d1ba4da872a7aec5d501e 100644 (file)
--- a/libs/freetdm/src/isdn/include/Q931.h
+++ b/libs/freetdm/src/isdn/include/Q931.h
@@ -113,8 +113,7 @@
 #include "stdio.h"\r
 \r
 #ifdef _MSC_VER\r
-/* warning C4244: conversion from 'type a' to 'type b', possible loss of data  TODO:  This one should not be disabled */\r
-#pragma warning(disable:4100 4244)\r
+#pragma warning(disable:4100)\r
 #endif\r
 \r
 /*****************************************************************************\r