From 2201f355ee933d35d9192e5ce58631adf63cf16f Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 21 May 2007 20:34:49 +0000 Subject: [PATCH] resolve msvc warning C4267 git-svn-id: http://svn.openzap.org/svn/openzap/trunk@81 a93c3328-9c30-0410-af19-c9cd2b2d52af --- libs/freetdm/src/isdn/Q931ie.c | 20 ++++++++++---------- libs/freetdm/src/isdn/include/Q931.h | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libs/freetdm/src/isdn/Q931ie.c b/libs/freetdm/src/isdn/Q931ie.c index a36eca1261..d10e5cdfc3 100644 --- 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 * *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_CallID) + x -1; - pie->Size = sizeof(Q931ie_CallID) + x -1; + pie->Size = (L3UCHAR)sizeof(Q931ie_CallID) + x -1; Q931SetIE(*pIE, *OOff); @@ -628,7 +628,7 @@ L3INT Q931Uie_CalledSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_CalledSub) + x - 1; - pie->Size = sizeof(Q931ie_CalledSub) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_CalledSub) + x - 1; Q931SetIE(*pIE, *OOff); @@ -721,7 +721,7 @@ L3INT Q931Uie_CalledNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_CalledNum) + x - 1; - pie->Size = sizeof(Q931ie_CalledNum) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_CalledNum) + x - 1; Q931SetIE(*pIE, *OOff); @@ -825,7 +825,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_CallingNum) + x - 1; - pie->Size = sizeof(Q931ie_CallingNum) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_CallingNum) + x - 1; Q931SetIE(*pIE, *OOff); @@ -931,7 +931,7 @@ L3INT Q931Uie_CallingSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_CallingSub) + x -1; - pie->Size = sizeof(Q931ie_CallingSub) + x -1; + pie->Size = (L3UCHAR)sizeof(Q931ie_CallingSub) + x -1; Q931SetIE(*pIE, *OOff); @@ -1480,7 +1480,7 @@ L3INT Q931Uie_Display(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_Display) + x - 1; - pie->Size = sizeof(Q931ie_Display) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_Display) + x - 1; Q931SetIE(*pIE, *OOff); @@ -1684,7 +1684,7 @@ L3INT Q931Uie_KeypadFac(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_KeypadFac) + x - 1; - pie->Size = sizeof(Q931ie_KeypadFac) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_KeypadFac) + x - 1; Q931SetIE(*pIE, *OOff); @@ -2165,7 +2165,7 @@ L3INT Q931Uie_NetFac(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_NetFac) + x - 1; - pie->Size = sizeof(Q931ie_NetFac) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_NetFac) + x - 1; Q931SetIE(*pIE, *OOff); @@ -2817,7 +2817,7 @@ L3INT Q931Uie_TransNetSel(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHA *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_TransNetSel) + x - 1; - pie->Size = sizeof(Q931ie_TransNetSel) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_TransNetSel) + x - 1; Q931SetIE(*pIE, *OOff); @@ -2906,7 +2906,7 @@ L3INT Q931Uie_UserUser(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * *IOff = (*IOff) + Octet + Off; *OOff = (*OOff) + sizeof(Q931ie_UserUser) + x - 1; - pie->Size = sizeof(Q931ie_UserUser) + x - 1; + pie->Size = (L3UCHAR)sizeof(Q931ie_UserUser) + x - 1; Q931SetIE(*pIE, *OOff); diff --git a/libs/freetdm/src/isdn/include/Q931.h b/libs/freetdm/src/isdn/include/Q931.h index 813f4a9bc8..ed1471494d 100644 --- a/libs/freetdm/src/isdn/include/Q931.h +++ b/libs/freetdm/src/isdn/include/Q931.h @@ -114,8 +114,7 @@ #ifdef _MSC_VER /* warning C4244: conversion from 'type a' to 'type b', 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 4267) +#pragma warning(disable:4100 4244) #endif /*****************************************************************************