osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

tds: use %lf instead of G_GINT64_MODIFIER for text.

Browse source 
On many platforms, G_GINT64_MODIFIER is "ll", that gives an error when used with
the float modifier:

../epan/dissectors/packet-tds.c:2270:55: error: length modifier 'll' results in undefined behavior or no effect with 'f' conversion specifier [-Werror,-Wformat]
                    proto_item_append_text(item, " (%"G_GINT64_MODIFIER"f)", tvb_get_letohieee_float(tvb, *offset));
                                                    ~~^~~~~~~~~~~~~~~~~~~
/usr/local/Cellar/glib/2.58.1/lib/glib-2.0/include/glibconfig.h:56:28: note: expanded from macro 'G_GINT64_MODIFIER'
 #define G_GINT64_MODIFIER "ll"
                           ^
1 error generated.

The solution appears to revert back to %lf.

Fixes: v2.9.0rc0-2411-gdbe2d081ec
Change-Id: I470cc5395921abc14aedd501f27881d5c21c618f
Reviewed-on: https://code.wireshark.org/review/30487
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo 2018-11-02 22:52:11 +01:00
parent 89d74238d9
commit 1fe542459c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
epan/dissectors/packet-tds.c
View file

@ -2267,7 +2267,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto
break;
case 4:
proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_float, tvb, *offset + 1, 4, ENC_LITTLE_ENDIAN);
proto_item_append_text(item, " (%"G_GINT64_MODIFIER"f)", tvb_get_letohieee_float(tvb, *offset));
proto_item_append_text(item, " (%lf)", tvb_get_letohieee_float(tvb, *offset));
break;
case 8:
proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_double, tvb, *offset + 1, 8, ENC_LITTLE_ENDIAN);