diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-12-08 17:45:02 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-12-08 17:45:02 +0000 |
| commit | 1621df1080428c3881f7d63258e578d83a9ca307 (patch) | |
| tree | bc81882dc512c85c8e848d11f23f17b5d013a912 | |
| parent | f4fcd1b1466936fbc54addc8b3b75fe8c8a0a288 (diff) | |
Warning fix:
- No comma after last element in enum
Fix:
- Call new_dissector_register for new style dissector.
svn path=/trunk/; revision=23808
| -rw-r--r-- | asn1/mpeg-pes/packet-mpeg-pes-template.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-mpeg-pes.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index 079eded62f..513b37e168 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -102,7 +102,7 @@ enum { DSM_TRICK_MODE_FLAG = 0x08, COPY_INFO_FLAG = 0x04, CRC_FLAG = 0x02, - EXTENSION_FLAG = 0x01, + EXTENSION_FLAG = 0x01 }; enum { @@ -111,7 +111,7 @@ enum { SEQUENCE_FLAG = 0x20, PSTD_BUFFER_FLAG = 0x10, MUST_BE_ONES = 0x07, - EXTENSION_FLAG2 = 0x01, + EXTENSION_FLAG2 = 0x01 }; static guint64 tvb_get_ntoh40(tvbuff_t *tvb, unsigned offset) @@ -562,7 +562,7 @@ proto_register_mpeg_pes(void) "Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); + new_register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); } void diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index c5f847a2e0..ed35ecea17 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-mpeg-pes.c */ -/* ../../tools/asn2wrs.py -p mpeg-pes -c mpeg-pes.cnf -s packet-mpeg-pes-template mpeg-pes.asn */ +/* ../../../svn/trunk/tools/asn2wrs.py -p mpeg-pes -c ../../../svn/trunk/asn1/mpeg-pes/mpeg-pes.cnf -s ../../../svn/trunk/asn1/mpeg-pes/packet-mpeg-pes-template -D ../../../svn/trunk/asn1/mpeg-pes mpeg-pes.asn */ /* Input file: packet-mpeg-pes-template.c */ @@ -543,7 +543,7 @@ enum { DSM_TRICK_MODE_FLAG = 0x08, COPY_INFO_FLAG = 0x04, CRC_FLAG = 0x02, - EXTENSION_FLAG = 0x01, + EXTENSION_FLAG = 0x01 }; enum { @@ -552,7 +552,7 @@ enum { SEQUENCE_FLAG = 0x20, PSTD_BUFFER_FLAG = 0x10, MUST_BE_ONES = 0x07, - EXTENSION_FLAG2 = 0x01, + EXTENSION_FLAG2 = 0x01 }; static guint64 tvb_get_ntoh40(tvbuff_t *tvb, unsigned offset) @@ -1219,7 +1219,7 @@ proto_register_mpeg_pes(void) "Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); + new_register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); } void |