diff options
| author | Zoran Bošnjak <zoran.bosnjak@via.si> | 2022-02-25 08:34:29 +0100 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-02-25 08:30:46 +0000 |
| commit | 85cf85999516db2856520e727ea84262db1cfbb5 (patch) | |
| tree | c7cf4b923a3bf269ab4a618a56b64ed709c44052 | |
| parent | 86c14aed44207d619bcbce7bb132afd27b3ffc77 (diff) | |
asterix: Sync with asterix-specs #4df694c69c
Windows build warning fix.
| -rw-r--r-- | epan/dissectors/packet-asterix.c | 6 | ||||
| -rw-r--r-- | tools/asterix/packet-asterix-template.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index aa61f74152..8cb93c49d3 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -9,7 +9,7 @@ See tools/asterix/README.md for details. Data source: https://zoranbosnjak.github.io/asterix-specs -git revision: e603aaae8a33e12870241e8202501048c51f7dca +git revision: 4df694c69c4302fe8a199ebdd903030a0e4200a0 */ @@ -124,7 +124,7 @@ static void dissect_asterix_data_block (tvbuff_t *tvb, packet_info *pinfo, guint static gint dissect_asterix_fields (tvbuff_t *, packet_info *pinfo, guint, proto_tree *, guint8, const AsterixField *[]); static void asterix_build_subtree (tvbuff_t *, packet_info *pinfo, guint, proto_tree *, const AsterixField *); -static void twos_complement (gint64 *, guint8); +static void twos_complement (gint64 *, gint); static guint8 asterix_bit (guint8, guint8); static guint asterix_fspec_len (tvbuff_t *, guint); static guint8 asterix_field_exists (tvbuff_t *, guint, int); @@ -43081,7 +43081,7 @@ static guint8 asterix_bit (guint8 b, guint8 bitNo) * bits need to be set to have proper two's complement. * If the number is negative, all other bits must be set to 1. * If the number is positive, all other bits must remain 0. */ -static void twos_complement (gint64 *v, guint8 bit_len) +static void twos_complement (gint64 *v, gint bit_len) { if (*v & (G_GUINT64_CONSTANT(1) << (bit_len - 1))) { *v |= (G_GUINT64_CONSTANT(0xffffffffffffffff) << bit_len); diff --git a/tools/asterix/packet-asterix-template.c b/tools/asterix/packet-asterix-template.c index f5db80bb8f..b426d2e1d7 100644 --- a/tools/asterix/packet-asterix-template.c +++ b/tools/asterix/packet-asterix-template.c @@ -123,7 +123,7 @@ static void dissect_asterix_data_block (tvbuff_t *tvb, packet_info *pinfo, guint static gint dissect_asterix_fields (tvbuff_t *, packet_info *pinfo, guint, proto_tree *, guint8, const AsterixField *[]); static void asterix_build_subtree (tvbuff_t *, packet_info *pinfo, guint, proto_tree *, const AsterixField *); -static void twos_complement (gint64 *, guint8); +static void twos_complement (gint64 *, gint); static guint8 asterix_bit (guint8, guint8); static guint asterix_fspec_len (tvbuff_t *, guint); static guint8 asterix_field_exists (tvbuff_t *, guint, int); @@ -684,7 +684,7 @@ static guint8 asterix_bit (guint8 b, guint8 bitNo) * bits need to be set to have proper two's complement. * If the number is negative, all other bits must be set to 1. * If the number is positive, all other bits must remain 0. */ -static void twos_complement (gint64 *v, guint8 bit_len) +static void twos_complement (gint64 *v, gint bit_len) { if (*v & (G_GUINT64_CONSTANT(1) << (bit_len - 1))) { *v |= (G_GUINT64_CONSTANT(0xffffffffffffffff) << bit_len); |