diff options
author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2007-01-18 11:02:26 +0000 |
---|---|---|
committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2007-01-18 11:02:26 +0000 |
commit | 997e5415f9009bd99c96338356c4b5358f04db49 (patch) | |
tree | 9889b4a8a5a373f924e1b02ccfcba07755c5d9f2 /gtk | |
parent | bb978e75725b3a32918a50a9a9d584fddce1d59b (diff) |
Add separate union entries to fvalue.value for signed and unsigned
32-bit numbers. Separate signed and unsigned accessors have been
added and used where appropriate.
Definitely not for 0.99.5.
svn path=/trunk/; revision=20472
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/io_stat.c | 13 | ||||
-rw-r--r-- | gtk/proto_draw.c | 2 | ||||
-rw-r--r-- | gtk/rtp_analysis.c | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/gtk/io_stat.c b/gtk/io_stat.c index df6fbc9058..ab4dd3e8a6 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -290,12 +290,21 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void * case FT_UINT16: case FT_UINT24: case FT_UINT32: + new_int=fvalue_get_uinteger(&((field_info *)gp->pdata[i])->value); + + if((new_int>it->int_max)||(it->frames==0)){ + it->int_max=new_int; + } + if((new_int<it->int_min)||(it->frames==0)){ + it->int_min=new_int; + } + it->int_tot+=new_int; + break; case FT_INT8: case FT_INT16: case FT_INT24: case FT_INT32: - new_int=fvalue_get_integer(&((field_info *)gp->pdata[i])->value); - + new_int=fvalue_get_sinteger(&((field_info *)gp->pdata[i])->value); if((new_int>it->int_max)||(it->frames==0)){ it->int_max=new_int; } diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index f5af94cc64..c2c13b17a4 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1882,7 +1882,7 @@ tree_view_follow_link(field_info *fi) gchar *url; if(fi->hfinfo->type == FT_FRAMENUM) { - cf_goto_frame(&cfile, fi->value.value.integer); + cf_goto_frame(&cfile, fi->value.value.uinteger); } if(FI_GET_FLAG(fi, FI_URL) && IS_FT_STRING(fi->hfinfo->type)) { url = g_strndup(tvb_get_ptr(fi->ds_tvb, fi->start, fi->length), fi->length); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 5ba0684036..81ebdb367f 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -3604,7 +3604,7 @@ static gboolean process_node(proto_node *ptree_node, header_field_info *hfinform *p_result = ipv4_get_net_order_addr(ipv4); } else { - *p_result = fvalue_get_integer(&finfo->value); + *p_result = fvalue_get_uinteger(&finfo->value); } return TRUE; } |