diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 11:46:49 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:46:12 +0000 |
| commit | d9e530bc177553c07bae7594e9b4f8e6235fc0e0 (patch) | |
| tree | 481239fdd3662cae66a4c5110b853563be7ca1cd /ui/gtk/compare_stat.c | |
| parent | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (diff) | |
| download | wireshark-d9e530bc177553c07bae7594e9b4f8e6235fc0e0.tar.gz | |
Use address functions instead of ADDRESS macros in ui.
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the ui directory.
Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba
Reviewed-on: https://code.wireshark.org/review/11199
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/compare_stat.c')
| -rw-r--r-- | ui/gtk/compare_stat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 7f3df82d7e..6b13fd2d55 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -157,8 +157,8 @@ comparestat_reset(void *arg) { compstat_t *cs=(compstat_t *)arg; - SET_ADDRESS(&cs->eth_src, AT_ETHER, 0, NULL); - SET_ADDRESS(&cs->eth_dst, AT_ETHER, 0, NULL); + set_address(&cs->eth_src, AT_ETHER, 0, NULL); + set_address(&cs->eth_dst, AT_ETHER, 0, NULL); gtk_tree_store_clear(cs->simple_list); comparestat_set_title(cs); @@ -327,7 +327,7 @@ call_foreach_new_order(gpointer key _U_, gpointer value, gpointer arg) fInfoTemp=(frame_info *)g_hash_table_lookup(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id)); if(fInfoTemp==NULL){ if(TTL_method==FALSE){ - if((ADDRESSES_EQUAL(&cs->eth_dst, &fInfo->dl_dst)) || (ADDRESSES_EQUAL(&cs->eth_src, &fInfo->dl_dst))){ + if((addresses_equal(&cs->eth_dst, &fInfo->dl_dst)) || (addresses_equal(&cs->eth_src, &fInfo->dl_dst))){ g_hash_table_insert(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); fInfo->zebra_time=cs->zebra_time; cs->zebra_time.nsecs=cs->zebra_time.nsecs + MERGED_FILES; @@ -352,7 +352,7 @@ call_foreach_new_order(gpointer key _U_, gpointer value, gpointer arg) } } else { if(TTL_method==FALSE){ - if(((ADDRESSES_EQUAL(&cs->eth_dst, &fInfo->dl_dst)) || (ADDRESSES_EQUAL(&cs->eth_src, &fInfo->dl_dst)))&&(!fmod(fInfoTemp->zebra_time.nsecs,MERGED_FILES))){ + if(((addresses_equal(&cs->eth_dst, &fInfo->dl_dst)) || (addresses_equal(&cs->eth_src, &fInfo->dl_dst)))&&(!fmod(fInfoTemp->zebra_time.nsecs,MERGED_FILES))){ fInfo->zebra_time.nsecs=fInfoTemp->zebra_time.nsecs; } else { fInfo->zebra_time.nsecs=fInfoTemp->zebra_time.nsecs+1; |