matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Derive field max from bitSize instead of saving it

Browse Source
This commit is contained in:
Srivats P 2021-12-09 09:52:42 +05:30
parent dc7ac89c30
commit c1610f4c99
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/findreplace.cpp
View File

@ -41,7 +41,7 @@ FindReplaceDialog::FindReplaceDialog(Action *action, QWidget *parent)
useFindMask->setChecked(false); useFindMask->setChecked(false);
useReplaceMask->setChecked(false); useReplaceMask->setChecked(false);
// TODO: remove combo protocols, sample, userscript // TODO: remove combo protocols - see note in StreamBase::findReplace
QStringList protocolList = OstProtocolManager->protocolDatabase(); QStringList protocolList = OstProtocolManager->protocolDatabase();
protocolList.sort(); protocolList.sort();
protocol->addItems(protocolList); protocol->addItems(protocolList);
@ -77,8 +77,6 @@ void FindReplaceDialog::on_protocol_currentIndexChanged(const QString &name)
FieldAttrib fieldAttrib; FieldAttrib fieldAttrib;
fieldAttrib.index = i; // fieldIndex fieldAttrib.index = i; // fieldIndex
fieldAttrib.bitSize = bitSize; fieldAttrib.bitSize = bitSize;
// FIXME: do we need max, since we already have bitSize?
fieldAttrib.max = quint64(~0) >> (64-bitSize); // min is always 0
// field and fieldAttrib_ have same count and order of fields // field and fieldAttrib_ have same count and order of fields
fieldAttrib_.append(fieldAttrib); fieldAttrib_.append(fieldAttrib);
@ -121,19 +119,20 @@ void FindReplaceDialog::on_field_currentIndexChanged(int index)
replaceMask->setType(FieldEdit::kIp6Address); replaceMask->setType(FieldEdit::kIp6Address);
replaceValue->setType(FieldEdit::kIp6Address); replaceValue->setType(FieldEdit::kIp6Address);
} else { } else {
quint64 max = quint64(~0) >> (64-fieldAttrib.bitSize);
qDebug("XXXXXX %s bitSize %d max %llx", qDebug("XXXXXX %s bitSize %d max %llx",
qPrintable(field->currentText()), qPrintable(field->currentText()),
fieldAttrib.bitSize, fieldAttrib.max); fieldAttrib.bitSize, max);
findMask->setType(FieldEdit::kUInt64); findMask->setType(FieldEdit::kUInt64);
findMask->setRange(0, fieldAttrib.max); findMask->setRange(0, max);
findValue->setType(FieldEdit::kUInt64); findValue->setType(FieldEdit::kUInt64);
findValue->setRange(0, fieldAttrib.max); findValue->setRange(0, max);
replaceMask->setType(FieldEdit::kUInt64); replaceMask->setType(FieldEdit::kUInt64);
replaceMask->setRange(0, fieldAttrib.max); replaceMask->setRange(0, max);
replaceValue->setType(FieldEdit::kUInt64); replaceValue->setType(FieldEdit::kUInt64);
replaceValue->setRange(0, fieldAttrib.max); replaceValue->setRange(0, max);
} }
} }

1
client/findreplace.h
View File

@ -60,7 +60,6 @@ struct FindReplaceDialog::FieldAttrib
{ {
quint32 index; quint32 index;
int bitSize; int bitSize;
quint64 max;
}; };
#endif #endif