resolve msvc warning C4267

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

diff --git a/libs/freetdm/src/isdn/Q931ie.c b/libs/freetdm/src/isdn/Q931ie.c
index a36eca1261459ee14f305594a832288278b3ca5c..d10e5cdfc338ce65374ff2e54dbd5ffd2fe22491 100644 (file)
--- a/libs/freetdm/src/isdn/Q931ie.c
+++ b/libs/freetdm/src/isdn/Q931ie.c
@@ -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 = sizeof(Q931ie_CallID) + x -1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_CallID) + x -1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_CalledSub) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_CalledSub) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_CalledNum) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_CalledNum) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_CallingNum) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_CallingNum) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_CallingSub) + x -1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_CallingSub) + x -1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_Display) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_Display) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_KeypadFac) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_KeypadFac) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_NetFac) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_NetFac) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_TransNetSel) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_TransNetSel) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\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 = sizeof(Q931ie_UserUser) + x - 1;\r
+    pie->Size = (L3UCHAR)sizeof(Q931ie_UserUser) + x - 1;\r
 \r
     Q931SetIE(*pIE, *OOff);\r
 \r

diff --git a/libs/freetdm/src/isdn/include/Q931.h b/libs/freetdm/src/isdn/include/Q931.h
index 813f4a9bc8d175f29340eae8ee9d2660b8835316..ed1471494d55cb65637d86959f38e9bef61b3c60 100644 (file)
--- a/libs/freetdm/src/isdn/include/Q931.h
+++ b/libs/freetdm/src/isdn/include/Q931.h
@@ -114,8 +114,7 @@
 \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
-/* warning C4267: '=' : conversion from 'size_t' to 'unsigned char', possible loss of data TODO:  This one should not be disabled */\r
-#pragma warning(disable:4100 4244 4267)\r
+#pragma warning(disable:4100 4244)\r
 #endif\r
 \r
 /*****************************************************************************\r