diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-03-15 16:08:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-03-15 23:08:08 +0000 |
| commit | af8de1a7c5dc944cb0f49dd4dd8004c400d87a00 (patch) | |
| tree | d788c9cd1b061cc12de55cf0309ba46c0fde501a | |
| parent | 3570d264c1de081fe0d05309efab46ef569de07e (diff) | |
| download | wireshark-af8de1a7c5dc944cb0f49dd4dd8004c400d87a00.tar.gz | |
More "FT_BOOLEAN is 64-bit" fixes.
Change-Id: Iaacd492858ca2fb98c4947d587fbbd26fc102a7d
Reviewed-on: https://code.wireshark.org/review/14486
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/print.c | 2 | ||||
| -rw-r--r-- | epan/proto.c | 6 | ||||
| -rw-r--r-- | epan/wslua/wslua_field.c | 2 | ||||
| -rw-r--r-- | rawshark.c | 4 | ||||
| -rw-r--r-- | ui/gtk/packet_win.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/epan/print.c b/epan/print.c index 5e25ed50bc..ca4aa71b8d 100644 --- a/epan/print.c +++ b/epan/print.c @@ -434,13 +434,13 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data) case FT_UINT16: case FT_UINT24: case FT_UINT32: - case FT_BOOLEAN: fprintf(pdata->fh, "%X", fvalue_get_uinteger(&fi->value)); break; case FT_INT40: case FT_INT48: case FT_INT56: case FT_INT64: + case FT_BOOLEAN: fprintf(pdata->fh, "%" G_GINT64_MODIFIER "X", fvalue_get_sinteger64(&fi->value)); break; case FT_UINT40: diff --git a/epan/proto.c b/epan/proto.c index 416b03624c..87043c989e 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5002,18 +5002,18 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, break; case FT_BOOLEAN: - number = fvalue_get_uinteger(&finfo->value); + number64 = fvalue_get_uinteger64(&finfo->value); tfstring = (const true_false_string *)&tfs_true_false; if (hfinfo->strings) { tfstring = (const struct true_false_string*) hfinfo->strings; } offset_r += protoo_strlcpy(result+offset_r, - number ? + number64 ? tfstring->true_string : tfstring->false_string, size-offset_r); offset_e += protoo_strlcpy(expr+offset_e, - number ? "1" : "0", size-offset_e); + number64 ? "1" : "0", size-offset_e); break; /* XXX - make these just FT_NUMBER? */ diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index 0bb3e26774..598931a4ea 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -95,7 +95,7 @@ WSLUA_METAMETHOD FieldInfo__call(lua_State* L) { switch(fi->ws_fi->hfinfo->type) { case FT_BOOLEAN: - lua_pushboolean(L,(int)fvalue_get_uinteger(&(fi->ws_fi->value))); + lua_pushboolean(L,(int)fvalue_get_uinteger64(&(fi->ws_fi->value))); return 1; case FT_UINT8: case FT_UINT16: diff --git a/rawshark.c b/rawshark.c index 523313c7c5..8fe77133cf 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1313,9 +1313,9 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) case SF_STRVAL: switch(hfinfo->type) { case FT_BOOLEAN: - uvalue = fvalue_get_uinteger(&finfo->value); + uvalue64 = fvalue_get_uinteger64(&finfo->value); tfstring = (const struct true_false_string*) hfinfo->strings; - g_string_append(label_s, uvalue ? tfstring->true_string : tfstring->false_string); + g_string_append(label_s, uvalue64 ? tfstring->true_string : tfstring->false_string); break; case FT_INT8: case FT_INT16: diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 179988b901..7459019653 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -611,7 +611,7 @@ new_finfo_window(GtkWidget *w, struct FieldinfoWinData *DataPtr) } else if (finfo_type == FT_BOOLEAN) { fvalue_edit = gtk_check_button_new(); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fvalue_edit), (fvalue_get_uinteger(&finfo->value) != 0)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fvalue_edit), (fvalue_get_uinteger64(&finfo->value) != 0)); g_signal_connect(fvalue_edit, "toggled", G_CALLBACK(finfo_boolean_changed), DataPtr); } else if (finfo_type == FT_IPv4) { |