|
1 From af8de1a7c5dc944cb0f49dd4dd8004c400d87a00 Mon Sep 17 00:00:00 2001 |
|
2 From: Guy Harris <[email protected]> |
|
3 Date: Tue, 15 Mar 2016 16:08:06 -0700 |
|
4 Subject: [PATCH] More "FT_BOOLEAN is 64-bit" fixes. |
|
5 |
|
6 Change-Id: Iaacd492858ca2fb98c4947d587fbbd26fc102a7d |
|
7 Reviewed-on: https://code.wireshark.org/review/14486 |
|
8 Reviewed-by: Guy Harris <[email protected]> |
|
9 --- |
|
10 epan/print.c | 2 +- |
|
11 epan/proto.c | 6 +++--- |
|
12 epan/wslua/wslua_field.c | 2 +- |
|
13 rawshark.c | 4 ++-- |
|
14 ui/gtk/packet_win.c | 2 +- |
|
15 5 files changed, 8 insertions(+), 8 deletions(-) |
|
16 |
|
17 diff --git a/epan/print.c b/epan/print.c |
|
18 index 5e25ed5..ca4aa71 100644 |
|
19 --- epan/print.c |
|
20 +++ epan/print.c |
|
21 @@ -434,13 +434,13 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data) |
|
22 case FT_UINT16: |
|
23 case FT_UINT24: |
|
24 case FT_UINT32: |
|
25 - case FT_BOOLEAN: |
|
26 fprintf(pdata->fh, "%X", fvalue_get_uinteger(&fi->value)); |
|
27 break; |
|
28 case FT_INT40: |
|
29 case FT_INT48: |
|
30 case FT_INT56: |
|
31 case FT_INT64: |
|
32 + case FT_BOOLEAN: |
|
33 fprintf(pdata->fh, "%" G_GINT64_MODIFIER "X", fvalue_get_sinteger64(&fi->value)); |
|
34 break; |
|
35 case FT_UINT40: |
|
36 diff --git a/epan/proto.c b/epan/proto.c |
|
37 index 416b036..87043c9 100644 |
|
38 --- epan/proto.c |
|
39 +++ epan/proto.c |
|
40 @@ -5002,18 +5002,18 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, |
|
41 break; |
|
42 |
|
43 case FT_BOOLEAN: |
|
44 - number = fvalue_get_uinteger(&finfo->value); |
|
45 + number64 = fvalue_get_uinteger64(&finfo->value); |
|
46 tfstring = (const true_false_string *)&tfs_true_false; |
|
47 if (hfinfo->strings) { |
|
48 tfstring = (const struct true_false_string*) hfinfo->strings; |
|
49 } |
|
50 offset_r += protoo_strlcpy(result+offset_r, |
|
51 - number ? |
|
52 + number64 ? |
|
53 tfstring->true_string : |
|
54 tfstring->false_string, size-offset_r); |
|
55 |
|
56 offset_e += protoo_strlcpy(expr+offset_e, |
|
57 - number ? "1" : "0", size-offset_e); |
|
58 + number64 ? "1" : "0", size-offset_e); |
|
59 break; |
|
60 |
|
61 /* XXX - make these just FT_NUMBER? */ |
|
62 diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c |
|
63 index 0bb3e26..598931a 100644 |
|
64 --- epan/wslua/wslua_field.c |
|
65 +++ epan/wslua/wslua_field.c |
|
66 @@ -95,7 +95,7 @@ WSLUA_METAMETHOD FieldInfo__call(lua_State* L) { |
|
67 |
|
68 switch(fi->ws_fi->hfinfo->type) { |
|
69 case FT_BOOLEAN: |
|
70 - lua_pushboolean(L,(int)fvalue_get_uinteger(&(fi->ws_fi->value))); |
|
71 + lua_pushboolean(L,(int)fvalue_get_uinteger64(&(fi->ws_fi->value))); |
|
72 return 1; |
|
73 case FT_UINT8: |
|
74 case FT_UINT16: |
|
75 diff --git a/rawshark.c b/rawshark.c |
|
76 index 523313c..8fe7713 100644 |
|
77 --- rawshark.c |
|
78 +++ rawshark.c |
|
79 @@ -1313,9 +1313,9 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) |
|
80 case SF_STRVAL: |
|
81 switch(hfinfo->type) { |
|
82 case FT_BOOLEAN: |
|
83 - uvalue = fvalue_get_uinteger(&finfo->value); |
|
84 + uvalue64 = fvalue_get_uinteger64(&finfo->value); |
|
85 tfstring = (const struct true_false_string*) hfinfo->strings; |
|
86 - g_string_append(label_s, uvalue ? tfstring->true_string : tfstring->false_string); |
|
87 + g_string_append(label_s, uvalue64 ? tfstring->true_string : tfstring->false_string); |
|
88 break; |
|
89 case FT_INT8: |
|
90 case FT_INT16: |
|
91 diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c |
|
92 index 179988b..7459019 100644 |
|
93 --- ui/gtk/packet_win.c |
|
94 +++ ui/gtk/packet_win.c |
|
95 @@ -611,7 +611,7 @@ new_finfo_window(GtkWidget *w, struct FieldinfoWinData *DataPtr) |
|
96 |
|
97 } else if (finfo_type == FT_BOOLEAN) { |
|
98 fvalue_edit = gtk_check_button_new(); |
|
99 - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fvalue_edit), (fvalue_get_uinteger(&finfo->value) != 0)); |
|
100 + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fvalue_edit), (fvalue_get_uinteger64(&finfo->value) != 0)); |
|
101 g_signal_connect(fvalue_edit, "toggled", G_CALLBACK(finfo_boolean_changed), DataPtr); |
|
102 |
|
103 } else if (finfo_type == FT_IPv4) { |