diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-02-28 15:42:58 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-02-28 15:42:58 +0000 |
| commit | 9a7dbb4182e4b1867a646a05f069818651d364ff (patch) | |
| tree | 984faa6da98644e419d8e1b3b73366783f9cbda9 /epan/dissectors/packet-csn1.c | |
| parent | 4c26d6ccb3e3a0d156a7400ad4aa5884c0c63c62 (diff) | |
From Pascal Quantin:
the attached patch should hopefully please the buildbots
svn path=/trunk/; revision=36095
Diffstat (limited to 'epan/dissectors/packet-csn1.c')
| -rw-r--r-- | epan/dissectors/packet-csn1.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c index 4c4da79b8b..bab8dab6bb 100644 --- a/epan/dissectors/packet-csn1.c +++ b/epan/dissectors/packet-csn1.c @@ -370,7 +370,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ int i =0; - if (pDescr->serialize != 0) + if (pDescr->serialize.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -420,7 +420,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize; + guint16 nSize = (guint16)(gint32)pDescr->serialize.value; int i =0; pui8 = pui8DATA(data, pDescr->offset); @@ -573,7 +573,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD case CSN_SERIALIZE: { - StreamSerializeFcn_t serialize = pDescr->serialize; + StreamSerializeFcn_t serialize = pDescr->serialize.fcn; csnStream_t arT = *ar; gint16 Status = -1; proto_item *ti; @@ -824,7 +824,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ gint i = 0; - if (pDescr->serialize != 0) + if (pDescr->serialize.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -888,7 +888,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD gint16 Status; csnStream_t arT = *ar; guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->serialize; + guint16 nSize = (guint16)(guint32)pDescr->serialize.value; gint i = 0; pui8 = pui8DATA(data, pDescr->offset); @@ -1299,7 +1299,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize; + gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; guint8 ElementCount = 0; while (existNextElement(tvb, bit_offset, Tag)) @@ -1367,7 +1367,7 @@ gint16 csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pD * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize; + gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; guint8 ElementCount = 0; csnStream_t arT = *ar; gboolean EndOfList = FALSE; |