diff options
author | Stephen Fisher <sfisher@sdf.org> | 2014-12-19 19:28:59 -0700 |
---|---|---|
committer | Stephen Fisher <sfisher@sdf.org> | 2014-12-20 02:30:17 +0000 |
commit | 201a7e7d689bef213a0d303601c6ac41d02a21be (patch) | |
tree | b369989d2c6b435f2eca40830b07eca19adfba3d | |
parent | 556f9a5b2bb1af631de375558fa60a772c92af10 (diff) |
Change more variables from si_code to mtp3_si_code to avoid conflicts
with a #define in a NetBSD header file.
Change-Id: I2136db207cb4707571920b373708fcb63505131c
Reviewed-on: https://code.wireshark.org/review/5900
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-rw-r--r-- | ui/gtk/mtp3_stat.c | 12 | ||||
-rw-r--r-- | ui/gtk/mtp3_stat.h | 2 | ||||
-rw-r--r-- | ui/gtk/mtp3_summary.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index eb6e06b379..9e2a9d28a4 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -279,8 +279,8 @@ mtp3_stat_packet( (*stat_p)[i].addr_opc = data_p->addr_opc; (*stat_p)[i].addr_dpc = data_p->addr_dpc; - (*stat_p)[i].si_code[data_p->mtp3_si_code].num_msus++; - (*stat_p)[i].si_code[data_p->mtp3_si_code].size += data_p->size; + (*stat_p)[i].mtp3_si_code[data_p->mtp3_si_code].num_msus++; + (*stat_p)[i].mtp3_si_code[data_p->mtp3_si_code].size += data_p->size; return(TRUE); } @@ -322,8 +322,8 @@ mtp3_stat_draw( * should generally be preferred when inserting rows in a sorted list store. */ avg = 0.0f; - if ((*stat_p)[i].si_code[j].num_msus !=0){ - avg = (float)(*stat_p)[i].si_code[j].size/(float)(*stat_p)[i].si_code[j].num_msus; + if ((*stat_p)[i].mtp3_si_code[j].num_msus !=0){ + avg = (float)(*stat_p)[i].mtp3_si_code[j].size/(float)(*stat_p)[i].mtp3_si_code[j].num_msus; } @@ -331,8 +331,8 @@ mtp3_stat_draw( OPC_COLUMN, dlg.entries[0], DPC_COLUMN, dlg.entries[1], SI_COLUMN, mtp3_service_indicator_code_short_vals[j].strptr, - NUM_MSUS_COLUMN, (*stat_p)[i].si_code[j].num_msus, - NUM_BYTES_COLUMN, (*stat_p)[i].si_code[j].size, + NUM_MSUS_COLUMN, (*stat_p)[i].mtp3_si_code[j].num_msus, + NUM_BYTES_COLUMN, (*stat_p)[i].mtp3_si_code[j].size, AVG_BYTES_COLUMN, avg, -1); } diff --git a/ui/gtk/mtp3_stat.h b/ui/gtk/mtp3_stat.h index 396e92772a..2ac9aa11f5 100644 --- a/ui/gtk/mtp3_stat.h +++ b/ui/gtk/mtp3_stat.h @@ -38,7 +38,7 @@ typedef struct _mtp3_stat_si_code_t { typedef struct _mtp3_stat_t { mtp3_addr_pc_t addr_opc; mtp3_addr_pc_t addr_dpc; - mtp3_stat_si_code_t si_code[MTP3_NUM_SI_CODE]; + mtp3_stat_si_code_t mtp3_si_code[MTP3_NUM_SI_CODE]; } mtp3_stat_t; /* diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index de08b491b0..4b934bf1af 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -233,8 +233,8 @@ mtp3_sum_draw( while (j < mtp3_num_used) { - num_msus += mtp3_stat[j].si_code[i].num_msus; - num_bytes += mtp3_stat[j].si_code[i].size; + num_msus += mtp3_stat[j].mtp3_si_code[i].num_msus; + num_bytes += mtp3_stat[j].mtp3_si_code[i].size; j++; } |