osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Remove unused offset variables. 

Fixes CID 1327340.

Change-Id: I1914e21ca7c0e911534a850fe2a8210b28650bee
Reviewed-on: https://code.wireshark.org/review/11055
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
This commit is contained in:
Martin Mathieson 2015-10-15 02:00:55 -07:00
parent feb6b58e28
commit dfe1b0f054
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/qt/lte_rlc_graph_dialog.cpp
View File

@ -199,11 +199,6 @@ void LteRlcGraphDialog::fillGraph()
acks_graph_->setScatterStyle(QCPScatterStyle(QCPScatterStyle::ssDisc, pkt_point_size_));
nacks_graph_->setScatterStyle(QCPScatterStyle(QCPScatterStyle::ssDisc, pkt_point_size_*2));
ts_offset_ = 0;
seq_offset_ = 0; // TODO: needed?
bool first = true;
// Map timestamps -> segments in first pass.
time_stamp_map_.clear();
for (struct rlc_segment *seg = graph_.segments; seg != NULL; seg = seg->next) {
@ -211,14 +206,8 @@ void LteRlcGraphDialog::fillGraph()
continue;
}
double ts = seg->rel_secs + seg->rel_usecs / 1000000.0;
if (first) {
// Take note of first sequence number seen.
if (seq_origin_zero_) {
seq_offset_ = seg->SN;
}
first = false;
}
time_stamp_map_.insertMulti(ts - ts_offset_, seg);
time_stamp_map_.insertMulti(ts, seg);
}
// Now sequence numbers.
@ -227,17 +216,17 @@ void LteRlcGraphDialog::fillGraph()
acks_time, acks,
nacks_time, nacks;
for (struct rlc_segment *seg = graph_.segments; seg != NULL; seg = seg->next) {
double ts = (seg->rel_secs + seg->rel_usecs / 1000000.0) - ts_offset_;
double ts = seg->rel_secs + seg->rel_usecs / 1000000.0;
if (compareHeaders(seg)) {
if (!seg->isControlPDU) {
// Data
if (seg->isResegmented) {
reseg_seq_time.append(ts);
reseg_seq.append(seg->SN - seq_offset_);
reseg_seq.append(seg->SN);
}
else {
seq_time.append(ts);
seq.append(seg->SN - seq_offset_);
seq.append(seg->SN);
}
}
else {

3
ui/qt/lte_rlc_graph_dialog.h
View File

@ -61,10 +61,7 @@ private:
// Data
QMap<double, struct rlc_segment *> time_stamp_map_;
double ts_offset_;
QMap<double, struct rlc_segment *> sequence_num_map_;
double seq_offset_;
bool seq_origin_zero_;
QCPGraph *base_graph_; // Clickable packets
QCPGraph *reseg_graph_;