From 099bcc22ccaf492d2650bfff334f271d19ce240d Mon Sep 17 00:00:00 2001 From: Sirius Bakke Date: Thu, 4 Oct 2018 16:20:02 +0200 Subject: [PATCH] refactor: Disable unused variables in production code --- src/cisco_lib/CompilerDriver_pix_run.cpp | 2 ++ src/cisco_lib/NATCompiler_pix.cpp | 6 ++++++ src/cisco_lib/NATCompiler_pix_find_translations.cpp | 2 ++ src/cisco_lib/NATCompiler_pix_optimizers.cpp | 2 ++ src/cisco_lib/NATCompiler_pix_writers.cpp | 13 ++++++++++--- src/cisco_lib/OSConfigurator_pix_os.cpp | 2 ++ .../PolicyCompiler_pix_replace_translations.cpp | 6 +++++- src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp | 2 ++ src/import/IPTImporter.cpp | 4 ++++ src/iptlib/NATCompiler_ipt.cpp | 2 ++ src/iptlib/PolicyCompiler_PrintRule.cpp | 2 ++ src/iptlib/PolicyCompiler_ipt.cpp | 7 +++++++ src/libfwbuilder/src/fwcompiler/NATCompiler.cpp | 4 ++++ src/libgui/AddressRangeDialog.cpp | 2 ++ src/libgui/AddressTableDialog.cpp | 3 +++ src/libgui/AttachedNetworksDialog.cpp | 5 +++++ src/libgui/ClusterGroupDialog.cpp | 2 ++ src/libgui/DNSNameDialog.cpp | 3 ++- src/libgui/FirewallDialog.cpp | 5 +++++ src/libgui/HostDialog.cpp | 4 ++++ src/libgui/IPv4Dialog.cpp | 3 +++ src/libgui/IPv6Dialog.cpp | 3 +++ src/libgui/NetworkDialog.cpp | 3 +++ src/libgui/NetworkDialogIPv6.cpp | 3 +++ src/libgui/ObjectManipulator_create_new.cpp | 6 ++++++ src/libgui/ObjectManipulator_ops.cpp | 4 +++- src/libgui/TagServiceDialog.cpp | 3 ++- src/libgui/UserDialog.cpp | 2 ++ src/libgui/freebsdAdvancedDialog.cpp | 2 ++ src/libgui/iosAdvancedDialog.cpp | 2 ++ src/libgui/ipcoposAdvancedDialog.cpp | 2 ++ src/libgui/junosAdvancedDialog.cpp | 2 ++ src/libgui/linksysAdvancedDialog.cpp | 5 +++++ src/libgui/linux24AdvancedDialog.cpp | 4 ++++ src/libgui/macosxAdvancedDialog.cpp | 2 ++ src/libgui/nxosAdvancedDialog.cpp | 2 ++ src/libgui/openbsdAdvancedDialog.cpp | 4 ++++ src/libgui/pixAdvancedDialog.cpp | 6 ++++-- src/libgui/pixosAdvancedDialog.cpp | 2 ++ src/libgui/solarisAdvancedDialog.cpp | 2 ++ src/pflib/NATCompiler_ipf.cpp | 2 ++ src/pflib/NATCompiler_pf.cpp | 2 ++ src/pflib/PolicyCompiler_ipf_writers.cpp | 4 +++- src/pflib/PolicyCompiler_ipfw_writers.cpp | 4 +++- src/pflib/PolicyCompiler_pf_writers.cpp | 2 ++ 45 files changed, 143 insertions(+), 11 deletions(-) diff --git a/src/cisco_lib/CompilerDriver_pix_run.cpp b/src/cisco_lib/CompilerDriver_pix_run.cpp index 9243d3f3c..73bb97a0a 100644 --- a/src/cisco_lib/CompilerDriver_pix_run.cpp +++ b/src/cisco_lib/CompilerDriver_pix_run.cpp @@ -916,8 +916,10 @@ void CompilerDriver_pix::pixClusterConfigurationChecks(Cluster *cluster, failover_group->findByType(FWObjectReference::TYPENAME); it != it.end(); ++it) { +#ifndef NDEBUG Interface *member_iface = Interface::cast(FWObjectReference::getObject(*it)); assert(member_iface); +#endif pixClusterGroupChecks(failover_group); diff --git a/src/cisco_lib/NATCompiler_pix.cpp b/src/cisco_lib/NATCompiler_pix.cpp index 306bf3fe3..b58b04aae 100644 --- a/src/cisco_lib/NATCompiler_pix.cpp +++ b/src/cisco_lib/NATCompiler_pix.cpp @@ -241,8 +241,10 @@ string NATCompiler_pix::debugPrintRule(Rule *r) { NATRule *rule=NATRule::cast(r); +#ifndef NDEBUG RuleElementItfInb *itf_in_re = rule->getItfInb(); assert(itf_in_re!=NULL); RuleElementItfOutb *itf_out_re = rule->getItfOutb(); assert(itf_out_re!=NULL); +#endif ostringstream os; @@ -568,11 +570,15 @@ bool NATCompiler_pix::verifyRuleElements::processNext() { NATRule *rule=getNext(); if (rule==NULL) return false; +#ifndef NDEBUG Address *osrc=compiler->getFirstOSrc(rule); assert(osrc); +#endif Address *odst=compiler->getFirstODst(rule); assert(odst); Service *osrv=compiler->getFirstOSrv(rule); assert(osrv); +#ifndef NDEBUG Address *tsrc=compiler->getFirstTSrc(rule); assert(tsrc); +#endif Address *tdst=compiler->getFirstTDst(rule); assert(tdst); Service *tsrv=compiler->getFirstTSrv(rule); assert(tsrv); diff --git a/src/cisco_lib/NATCompiler_pix_find_translations.cpp b/src/cisco_lib/NATCompiler_pix_find_translations.cpp index 85084e11f..5154dc70a 100644 --- a/src/cisco_lib/NATCompiler_pix_find_translations.cpp +++ b/src/cisco_lib/NATCompiler_pix_find_translations.cpp @@ -100,7 +100,9 @@ list NATCompiler_pix::findMatchingDNATRules( Address *odst = getFirstODst(rule); assert(odst); Service *osrv = getFirstOSrv(rule); assert(osrv); +#ifndef NDEBUG Address *tsrc = getFirstTSrc(rule); assert(tsrc); +#endif // Address *tdst = getFirstTDst(rule); assert(tdst); Service *tsrv = getFirstTSrv(rule); assert(tsrv); diff --git a/src/cisco_lib/NATCompiler_pix_optimizers.cpp b/src/cisco_lib/NATCompiler_pix_optimizers.cpp index 048d66cca..35e8e1a8b 100644 --- a/src/cisco_lib/NATCompiler_pix_optimizers.cpp +++ b/src/cisco_lib/NATCompiler_pix_optimizers.cpp @@ -431,7 +431,9 @@ bool NATCompiler_pix::DetectOverlappingGlobalPoolsAndStaticRules::processNext() if (rule->getRuleType()== NATRule::DNAT ) { Address *outa=compiler->getFirstODst(rule); assert(outa); +#ifndef NDEBUG Address *insa=compiler->getFirstTDst(rule); assert(insa); +#endif for (map::iterator i=pix_comp->nat_commands.begin(); i!=pix_comp->nat_commands.end(); ++i) diff --git a/src/cisco_lib/NATCompiler_pix_writers.cpp b/src/cisco_lib/NATCompiler_pix_writers.cpp index 164a9a9b7..0f53b1b47 100644 --- a/src/cisco_lib/NATCompiler_pix_writers.cpp +++ b/src/cisco_lib/NATCompiler_pix_writers.cpp @@ -163,13 +163,15 @@ void NATCompiler_pix::PrintRule::printNONAT(NATRule *rule) string("/FWBuilderResources/Target/options/")+ "version_"+version+"/pix_commands/clear_acl"); - Address *osrc=compiler->getFirstOSrc(rule); assert(osrc); Address *odst=compiler->getFirstODst(rule); assert(odst); +#ifndef NDEBUG + Address *osrc=compiler->getFirstOSrc(rule); assert(osrc); Service *osrv=compiler->getFirstOSrv(rule); assert(osrv); Address *tsrc=compiler->getFirstTSrc(rule); assert(tsrc); Address *tdst=compiler->getFirstTDst(rule); assert(tdst); Service *tsrv=compiler->getFirstTSrv(rule); assert(tsrv); +#endif RuleElementItfInb *itf_in_re = rule->getItfInb(); assert(itf_in_re!=NULL); RuleElementItfOutb *itf_out_re = rule->getItfOutb(); assert(itf_out_re!=NULL); @@ -261,10 +263,12 @@ void NATCompiler_pix::PrintRule::printSNAT(NATRule *rule) Address *osrc = compiler->getFirstOSrc(rule); assert(osrc); Address *odst = compiler->getFirstODst(rule); assert(odst); Service *osrv = compiler->getFirstOSrv(rule); assert(osrv); - + +#ifndef NDEBUG Address *tsrc = compiler->getFirstTSrc(rule); assert(tsrc); Address *tdst = compiler->getFirstTDst(rule); assert(tdst); Service *tsrv = compiler->getFirstTSrv(rule); assert(tsrv); +#endif RuleElementItfInb *itf_in_re = rule->getItfInb(); assert(itf_in_re!=NULL); RuleElementItfOutb *itf_out_re = rule->getItfOutb(); assert(itf_out_re!=NULL); @@ -392,13 +396,16 @@ void NATCompiler_pix::PrintRule::printDNAT(NATRule *rule) string("/FWBuilderResources/Target/options/") + "version_" + version+"/pix_commands/clear_acl"); + Service *osrv = compiler->getFirstOSrv(rule); assert(osrv); + +#ifndef NDEBUG Address *osrc = compiler->getFirstOSrc(rule); assert(osrc); Address *odst = compiler->getFirstODst(rule); assert(odst); - Service *osrv = compiler->getFirstOSrv(rule); assert(osrv); Address *tsrc = compiler->getFirstTSrc(rule); assert(tsrc); Address *tdst = compiler->getFirstTDst(rule); assert(tdst); Service *tsrv = compiler->getFirstTSrv(rule); assert(tsrv); +#endif RuleElementItfInb *itf_in_re = rule->getItfInb(); assert(itf_in_re!=NULL); RuleElementItfOutb *itf_out_re = rule->getItfOutb(); assert(itf_out_re!=NULL); diff --git a/src/cisco_lib/OSConfigurator_pix_os.cpp b/src/cisco_lib/OSConfigurator_pix_os.cpp index bce121d3b..06c98dd80 100644 --- a/src/cisco_lib/OSConfigurator_pix_os.cpp +++ b/src/cisco_lib/OSConfigurator_pix_os.cpp @@ -659,8 +659,10 @@ string OSConfigurator_pix_os::_printSysopt() string platform = fw->getStr("platform"); string version = fw->getStr("version"); +#ifndef NDEBUG FWOptions *options=fw->getOptionsObject(); assert(options!=NULL); +#endif bool tcpmss = fw->getOptionsObject()->getBool("pix_tcpmss"); int tcpmss_val = fw->getOptionsObject()->getInt("pix_tcpmss_value"); diff --git a/src/cisco_lib/PolicyCompiler_pix_replace_translations.cpp b/src/cisco_lib/PolicyCompiler_pix_replace_translations.cpp index 18b8fbf24..c151e6cb2 100644 --- a/src/cisco_lib/PolicyCompiler_pix_replace_translations.cpp +++ b/src/cisco_lib/PolicyCompiler_pix_replace_translations.cpp @@ -135,8 +135,11 @@ void PolicyCompiler_pix::replaceTranslatedAddresses::action( FWObject *rule_iface = FWObjectReference::getObject(intf_re->front()); RuleElement *re = nat_rule->getOSrc(); + FWObject *o = FWReference::getObject(re->front()); +#ifndef NDEBUG Address *osrc = Address::cast(o); assert(osrc); +#endif re = nat_rule->getODst(); o = FWReference::getObject(re->front()); @@ -146,6 +149,7 @@ void PolicyCompiler_pix::replaceTranslatedAddresses::action( o = FWReference::getObject(re->front()); Service *osrv = Service::cast(o); assert(osrv); +#ifndef NDEBUG re = nat_rule->getTSrc(); o = FWReference::getObject(re->front()); Address *tsrc = Address::cast(o); assert(tsrc); @@ -157,7 +161,7 @@ void PolicyCompiler_pix::replaceTranslatedAddresses::action( re = nat_rule->getTSrv(); o = FWReference::getObject(re->front()); Service *tsrv = Service::cast(o); assert(tsrv); - +#endif FWObject *p = odst->getParent(); diff --git a/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp b/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp index 19d155201..3468d009f 100644 --- a/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp +++ b/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp @@ -173,7 +173,9 @@ bool PolicyCompiler_pix::EmulateOutboundACL_v6::processNext() if ( compiler->fw->getOptionsObject()->getBool("pix_emulate_out_acl") ) { RuleElementSrc *src = rule->getSrc(); assert(src); +#ifndef NDEBUG RuleElementDst *dst = rule->getDst(); assert(dst); +#endif try { diff --git a/src/import/IPTImporter.cpp b/src/import/IPTImporter.cpp index 8f42ed557..b74d34926 100644 --- a/src/import/IPTImporter.cpp +++ b/src/import/IPTImporter.cpp @@ -397,6 +397,7 @@ void IPTImporter::addSrv() void IPTImporter::processModuleMatches() { PolicyRule *rule = PolicyRule::cast(current_rule); +#ifndef NDEBUG RuleElementSrv* srv = rule->getSrv(); assert(srv!=NULL); @@ -405,6 +406,7 @@ void IPTImporter::processModuleMatches() FWOptions *ropt = current_rule->getOptionsObject(); assert(ropt!=NULL); +#endif addAllModuleMatches(rule); @@ -1251,11 +1253,13 @@ void IPTImporter::pushNATRule() NATRule *rule = NATRule::cast(current_rule); +#ifndef NDEBUG FWOptions *fwopt = getFirewallObject()->getOptionsObject(); assert(fwopt!=NULL); FWOptions *ropt = current_rule->getOptionsObject(); assert(ropt!=NULL); +#endif addOSrc(); addODst(); diff --git a/src/iptlib/NATCompiler_ipt.cpp b/src/iptlib/NATCompiler_ipt.cpp index 476bb9276..2fb21f20f 100644 --- a/src/iptlib/NATCompiler_ipt.cpp +++ b/src/iptlib/NATCompiler_ipt.cpp @@ -478,9 +478,11 @@ bool NATCompiler_ipt::VerifyRules::processNext() { NATRule *rule=getNext(); if (rule==NULL) return false; +#ifndef NDEBUG RuleElementOSrc *osrc=rule->getOSrc(); assert(osrc); RuleElementODst *odst=rule->getODst(); assert(odst); RuleElementOSrv *osrv=rule->getOSrv(); assert(osrv); +#endif RuleElementTSrc *tsrc=rule->getTSrc(); assert(tsrc); RuleElementTDst *tdst=rule->getTDst(); assert(tdst); diff --git a/src/iptlib/PolicyCompiler_PrintRule.cpp b/src/iptlib/PolicyCompiler_PrintRule.cpp index 62d3cbd2d..1bc68e741 100644 --- a/src/iptlib/PolicyCompiler_PrintRule.cpp +++ b/src/iptlib/PolicyCompiler_PrintRule.cpp @@ -558,8 +558,10 @@ string PolicyCompiler_ipt::PrintRule::_printActionOnReject(PolicyRule *rule) PolicyCompiler_ipt *ipt_comp = dynamic_cast(compiler); // RuleElementSrv *srvrel=rule->getSrv(); +#ifndef NDEBUG Service *srv = compiler->getFirstSrv(rule); assert(srv); +#endif string s = ipt_comp->getActionOnReject(rule); if (!s.empty()) diff --git a/src/iptlib/PolicyCompiler_ipt.cpp b/src/iptlib/PolicyCompiler_ipt.cpp index 63f24d6eb..fb8cca3d6 100644 --- a/src/iptlib/PolicyCompiler_ipt.cpp +++ b/src/iptlib/PolicyCompiler_ipt.cpp @@ -916,7 +916,9 @@ bool PolicyCompiler_ipt::Logging2::processNext() PolicyCompiler_ipt *ipt_comp = dynamic_cast(compiler); PolicyRule *rule = getNext(); if (rule==NULL) return false; +#ifndef NDEBUG RuleElementItf *itf_re = rule->getItf(); assert(itf_re!=NULL); +#endif RuleElementSrc *nsrc; RuleElementDst *ndst; @@ -1976,8 +1978,11 @@ bool PolicyCompiler_ipt::bridgingFw::processNext() * this only if the rule is not associated with any bridging * interfaces */ + +#ifndef NDEBUG RuleElementItf *itfre = rule->getItf(); assert(itfre); +#endif RuleElementItf *itf_re = rule->getItf(); assert(itf_re!=NULL); Interface *rule_iface = @@ -2190,7 +2195,9 @@ bool PolicyCompiler_ipt::splitIfSrcAny::processNext() /* See #2008. It appears "--physdev-out" is not allowed in OUTPUT * chain. */ +#ifndef NDEBUG RuleElementItf *itfre = rule->getItf(); assert(itfre); +#endif Interface *itf = compiler->getFirstItf(rule); if (fwopt->getBool("bridging_fw") && itf && itf->isBridgePort()) diff --git a/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp b/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp index 781f8ed22..c66520c88 100644 --- a/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp @@ -511,11 +511,15 @@ bool NATCompiler::ConvertToAtomicForAddresses::processNext() RuleElementOSrc *osrc=rule->getOSrc(); assert(osrc); RuleElementODst *odst=rule->getODst(); assert(odst); +#ifndef NDEBUG RuleElementOSrv *osrv=rule->getOSrv(); assert(osrv); +#endif RuleElementTSrc *tsrc=rule->getTSrc(); assert(tsrc); RuleElementTDst *tdst=rule->getTDst(); assert(tdst); +#ifndef NDEBUG RuleElementTSrv *tsrv=rule->getTSrv(); assert(tsrv); +#endif for (FWObject::iterator i1=osrc->begin(); i1!=osrc->end(); ++i1) { diff --git a/src/libgui/AddressRangeDialog.cpp b/src/libgui/AddressRangeDialog.cpp index cd1feed9d..0b1231c4d 100644 --- a/src/libgui/AddressRangeDialog.cpp +++ b/src/libgui/AddressRangeDialog.cpp @@ -99,8 +99,10 @@ void AddressRangeDialog::validate(bool *res) if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; } +#ifndef NDEBUG AddressRange *s = dynamic_cast(obj); assert(s!=NULL); +#endif try { InetAddr range_start(AF_UNSPEC, m_dialog->rangeStart->text().toLatin1().constData()); diff --git a/src/libgui/AddressTableDialog.cpp b/src/libgui/AddressTableDialog.cpp index e1f425ddd..37672abd4 100644 --- a/src/libgui/AddressTableDialog.cpp +++ b/src/libgui/AddressTableDialog.cpp @@ -116,8 +116,11 @@ void AddressTableDialog::updateButtons() void AddressTableDialog::validate(bool *res) { *res=true; + +#ifndef NDEBUG AddressTable *s = dynamic_cast(obj); assert(s!=NULL); +#endif if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; } } diff --git a/src/libgui/AttachedNetworksDialog.cpp b/src/libgui/AttachedNetworksDialog.cpp index 165106c45..65ce84233 100644 --- a/src/libgui/AttachedNetworksDialog.cpp +++ b/src/libgui/AttachedNetworksDialog.cpp @@ -129,8 +129,11 @@ void AttachedNetworksDialog::validate(bool *result) if (fwbdebug) qDebug() << "AttachedNetworksDialog::validate"; *result = true; + +#ifndef NDEBUG AttachedNetworks *s = dynamic_cast(obj); assert(s!=NULL); +#endif if (!validateName(this, obj, m_dialog->obj_name->text())) { @@ -144,8 +147,10 @@ void AttachedNetworksDialog::applyChanges() std::auto_ptr cmd( new FWCmdChange(m_project, obj)); FWObject* new_state = cmd->getNewState(); +#ifndef NDEBUG AttachedNetworks *s = dynamic_cast(new_state); assert(s!=NULL); +#endif string oldname = obj->getName(); new_state->setName(string(m_dialog->obj_name->text().toUtf8().constData())); diff --git a/src/libgui/ClusterGroupDialog.cpp b/src/libgui/ClusterGroupDialog.cpp index 7bb410b7a..71f9ec63e 100644 --- a/src/libgui/ClusterGroupDialog.cpp +++ b/src/libgui/ClusterGroupDialog.cpp @@ -279,8 +279,10 @@ void ClusterGroupDialog::applyChanges() std::auto_ptr cmd( new FWCmdChange(m_project, obj)); FWObject* new_state = cmd->getNewState(); +#ifndef NDEBUG ClusterGroup *g = dynamic_cast(new_state); assert(g != NULL); +#endif QString oldname = obj->getName().c_str(); new_state->setName(string(m_dialog->obj_name->text().toUtf8().constData())); diff --git a/src/libgui/DNSNameDialog.cpp b/src/libgui/DNSNameDialog.cpp index ee43304be..40b0ccd99 100644 --- a/src/libgui/DNSNameDialog.cpp +++ b/src/libgui/DNSNameDialog.cpp @@ -105,9 +105,10 @@ void DNSNameDialog::loadFWObject(FWObject *o) void DNSNameDialog::validate(bool *res) { *res=true; +#ifndef NDEBUG DNSName *s = dynamic_cast(obj); assert(s!=NULL); - +#endif if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; } } diff --git a/src/libgui/FirewallDialog.cpp b/src/libgui/FirewallDialog.cpp index 06995c005..22785f067 100644 --- a/src/libgui/FirewallDialog.cpp +++ b/src/libgui/FirewallDialog.cpp @@ -106,8 +106,10 @@ void FirewallDialog::loadFWObject(FWObject *o) /* ---------------- */ updateTimeStamps(); +#ifndef NDEBUG Management *mgmt=s->getManagementObject(); assert(mgmt!=NULL); +#endif // FWOptions *opt =s->getOptionsObject(); @@ -309,8 +311,11 @@ void FirewallDialog::applyChanges() FWObject* new_state = cmd->getNewState(); Firewall *s = dynamic_cast(new_state); + +#ifndef NDEBUG Management *mgmt = s->getManagementObject(); assert(mgmt!=NULL); +#endif string old_name = obj->getName(); string new_name = string(m_dialog->obj_name->text().toUtf8().constData()); diff --git a/src/libgui/HostDialog.cpp b/src/libgui/HostDialog.cpp index 9916c7f97..33d02bdb1 100644 --- a/src/libgui/HostDialog.cpp +++ b/src/libgui/HostDialog.cpp @@ -76,8 +76,10 @@ void HostDialog::loadFWObject(FWObject *o) init = true; +#ifndef NDEBUG Management *mgmt=s->getManagementObject(); assert(mgmt!=NULL); +#endif FWOptions *opt =s->getOptionsObject(); @@ -148,8 +150,10 @@ void HostDialog::applyChanges() Host *s = dynamic_cast(new_state); assert(s!=NULL); +#ifndef NDEBUG Management *mgmt = s->getManagementObject(); assert(mgmt!=NULL); +#endif FWOptions *opt =s->getOptionsObject(); diff --git a/src/libgui/IPv4Dialog.cpp b/src/libgui/IPv4Dialog.cpp index af9a7fbc0..0e70a3934 100644 --- a/src/libgui/IPv4Dialog.cpp +++ b/src/libgui/IPv4Dialog.cpp @@ -137,8 +137,11 @@ void IPv4Dialog::validate(bool *result) return; } +#ifndef NDEBUG IPv4 *s = dynamic_cast(obj); assert(s!=NULL); +#endif + try { InetAddr( m_dialog->address->text().trimmed().toLatin1().constData() ); diff --git a/src/libgui/IPv6Dialog.cpp b/src/libgui/IPv6Dialog.cpp index 917b90146..01f756032 100644 --- a/src/libgui/IPv6Dialog.cpp +++ b/src/libgui/IPv6Dialog.cpp @@ -140,8 +140,11 @@ void IPv6Dialog::validate(bool *res) if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; } +#ifndef NDEBUG IPv6 *s = dynamic_cast(obj); assert(s!=NULL); +#endif + try { InetAddr(AF_INET6, m_dialog->address->text().trimmed().toLatin1().constData() ); diff --git a/src/libgui/NetworkDialog.cpp b/src/libgui/NetworkDialog.cpp index 601909f5e..a319916ed 100644 --- a/src/libgui/NetworkDialog.cpp +++ b/src/libgui/NetworkDialog.cpp @@ -128,8 +128,11 @@ void NetworkDialog::validate(bool *result) return; } +#ifndef NDEBUG Network *s = dynamic_cast(obj); assert(s!=NULL); +#endif + try { InetAddr( m_dialog->address->text().toStdString() ); diff --git a/src/libgui/NetworkDialogIPv6.cpp b/src/libgui/NetworkDialogIPv6.cpp index f4396e398..77eea0dda 100644 --- a/src/libgui/NetworkDialogIPv6.cpp +++ b/src/libgui/NetworkDialogIPv6.cpp @@ -111,8 +111,11 @@ void NetworkDialogIPv6::validate(bool *res) return; } +#ifndef NDEBUG NetworkIPv6 *s = dynamic_cast(obj); assert(s != NULL); +#endif + try { InetAddr(AF_INET6, m_dialog->address->text().toStdString() ); diff --git a/src/libgui/ObjectManipulator_create_new.cpp b/src/libgui/ObjectManipulator_create_new.cpp index c8ea01184..0f0942b4c 100644 --- a/src/libgui/ObjectManipulator_create_new.cpp +++ b/src/libgui/ObjectManipulator_create_new.cpp @@ -511,8 +511,11 @@ FWObject* ObjectManipulator::newFirewall(QUndoCommand* macro) FWObject *parent = FWBTree().getStandardSlotForObject(getCurrentLib(), Firewall::TYPENAME); assert(parent); + +#ifndef NDEBUG ObjectTreeViewItem* parent_item = allItems[parent]; assert(parent_item); +#endif newFirewallDialog *nfd = new newFirewallDialog(this, parent); if (mw->isEditorVisible()) mw->hideEditor(); @@ -540,8 +543,11 @@ FWObject* ObjectManipulator::newCluster(QUndoCommand* macro, bool fromSelected) FWObject *parent = FWBTree().getStandardSlotForObject(getCurrentLib(), Cluster::TYPENAME); assert(parent); + +#ifndef NDEBUG ObjectTreeViewItem* parent_item = allItems[parent]; assert(parent_item); +#endif newClusterDialog *ncd = new newClusterDialog(this, parent); if (mw->isEditorVisible()) mw->hideEditor(); diff --git a/src/libgui/ObjectManipulator_ops.cpp b/src/libgui/ObjectManipulator_ops.cpp index 75de06208..adb1fa293 100644 --- a/src/libgui/ObjectManipulator_ops.cpp +++ b/src/libgui/ObjectManipulator_ops.cpp @@ -91,9 +91,11 @@ void ObjectManipulator::autoRenameChildren(FWObject *obj, if (oldName == QString::fromUtf8(obj->getName().c_str())) return; +#ifndef NDEBUG QTreeWidgetItem *itm = allItems[obj]; assert(itm!=NULL); - +#endif + if ((QString::fromUtf8(obj->getName().c_str())!=oldName) && (Host::isA(obj) || Firewall::cast(obj)!=NULL || Interface::isA(obj))) { diff --git a/src/libgui/TagServiceDialog.cpp b/src/libgui/TagServiceDialog.cpp index f5fdc452d..901c2b532 100644 --- a/src/libgui/TagServiceDialog.cpp +++ b/src/libgui/TagServiceDialog.cpp @@ -98,9 +98,10 @@ void TagServiceDialog::loadFWObject(FWObject *o) void TagServiceDialog::validate(bool *res) { *res=true; +#ifndef NDEBUG TagService *s = dynamic_cast(obj); assert(s!=NULL); - +#endif if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; } } diff --git a/src/libgui/UserDialog.cpp b/src/libgui/UserDialog.cpp index 4a2a921ff..220a16ed9 100644 --- a/src/libgui/UserDialog.cpp +++ b/src/libgui/UserDialog.cpp @@ -94,8 +94,10 @@ void UserDialog::validate(bool *res) if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; } +#ifndef NDEBUG UserService *s = dynamic_cast(obj); assert(s!=NULL); +#endif } diff --git a/src/libgui/freebsdAdvancedDialog.cpp b/src/libgui/freebsdAdvancedDialog.cpp index 68f9f3b8c..8d88f7ca8 100644 --- a/src/libgui/freebsdAdvancedDialog.cpp +++ b/src/libgui/freebsdAdvancedDialog.cpp @@ -63,8 +63,10 @@ freebsdAdvancedDialog::freebsdAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif QStringList threeStateMapping; diff --git a/src/libgui/iosAdvancedDialog.cpp b/src/libgui/iosAdvancedDialog.cpp index c608717c3..52be21d31 100644 --- a/src/libgui/iosAdvancedDialog.cpp +++ b/src/libgui/iosAdvancedDialog.cpp @@ -65,8 +65,10 @@ iosAdvancedDialog::iosAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwoptions=(Firewall::cast(obj))->getOptionsObject(); assert(fwoptions!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif /* Page "General" */ data.registerOption( m_dialog->ios_set_host_name , fwoptions, "ios_set_host_name" ); diff --git a/src/libgui/ipcoposAdvancedDialog.cpp b/src/libgui/ipcoposAdvancedDialog.cpp index 65e270b99..b00b2c6f7 100644 --- a/src/libgui/ipcoposAdvancedDialog.cpp +++ b/src/libgui/ipcoposAdvancedDialog.cpp @@ -70,8 +70,10 @@ ipcoposAdvancedDialog::ipcoposAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif QStringList threeStateMapping; diff --git a/src/libgui/junosAdvancedDialog.cpp b/src/libgui/junosAdvancedDialog.cpp index 2f9612f5a..1732493da 100644 --- a/src/libgui/junosAdvancedDialog.cpp +++ b/src/libgui/junosAdvancedDialog.cpp @@ -65,8 +65,10 @@ junosAdvancedDialog::junosAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwoptions=(Firewall::cast(obj))->getOptionsObject(); assert(fwoptions!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif /* Page "General" */ data.registerOption( m_dialog->junos_set_host_name , fwoptions, "junos_set_host_name" ); diff --git a/src/libgui/linksysAdvancedDialog.cpp b/src/libgui/linksysAdvancedDialog.cpp index f5c5a83fd..2becd1d02 100644 --- a/src/libgui/linksysAdvancedDialog.cpp +++ b/src/libgui/linksysAdvancedDialog.cpp @@ -64,8 +64,11 @@ linksysAdvancedDialog::linksysAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif + /* * since v2.0.3 we do not need to know shell prompt on linksys. Will * remove the page completely when code becomes stable. @@ -157,8 +160,10 @@ void linksysAdvancedDialog::reject() void linksysAdvancedDialog::setDefaultPrompts() { +#ifndef NDEBUG FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#endif m_dialog->linksys_prompt1->setText( Resources::getTargetOptionStr("sveasoft","default/prompt1").c_str() ); m_dialog->linksys_prompt2->setText( diff --git a/src/libgui/linux24AdvancedDialog.cpp b/src/libgui/linux24AdvancedDialog.cpp index 706e15343..a7d5b8a7d 100644 --- a/src/libgui/linux24AdvancedDialog.cpp +++ b/src/libgui/linux24AdvancedDialog.cpp @@ -71,8 +71,10 @@ linux24AdvancedDialog::linux24AdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif QStringList threeStateMapping; @@ -208,8 +210,10 @@ void linux24AdvancedDialog::accept() FWOptions* fwoptions = Firewall::cast(new_state)->getOptionsObject(); assert(fwoptions!=NULL); +#ifndef NDEBUG Management *mgmt = (Firewall::cast(new_state))->getManagementObject(); assert(mgmt!=NULL); +#endif data.saveAll(fwoptions); diff --git a/src/libgui/macosxAdvancedDialog.cpp b/src/libgui/macosxAdvancedDialog.cpp index 6138ec75a..6c5bc9f8f 100644 --- a/src/libgui/macosxAdvancedDialog.cpp +++ b/src/libgui/macosxAdvancedDialog.cpp @@ -63,8 +63,10 @@ macosxAdvancedDialog::macosxAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif QStringList threeStateMapping; diff --git a/src/libgui/nxosAdvancedDialog.cpp b/src/libgui/nxosAdvancedDialog.cpp index 27fb95dfc..1b521cc02 100644 --- a/src/libgui/nxosAdvancedDialog.cpp +++ b/src/libgui/nxosAdvancedDialog.cpp @@ -65,8 +65,10 @@ nxosAdvancedDialog::nxosAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwoptions=(Firewall::cast(obj))->getOptionsObject(); assert(fwoptions!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif /* Page "General" */ data.registerOption( m_dialog->nxos_set_host_name , fwoptions, "nxos_set_host_name" ); diff --git a/src/libgui/openbsdAdvancedDialog.cpp b/src/libgui/openbsdAdvancedDialog.cpp index 1f594a2fa..056133a6a 100644 --- a/src/libgui/openbsdAdvancedDialog.cpp +++ b/src/libgui/openbsdAdvancedDialog.cpp @@ -64,8 +64,10 @@ openbsdAdvancedDialog::openbsdAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif QStringList threeStateMapping; @@ -120,8 +122,10 @@ void openbsdAdvancedDialog::accept() FWOptions* fwoptions = Firewall::cast(new_state)->getOptionsObject(); assert(fwoptions!=NULL); +#ifndef NDEBUG Management *mgmt = (Firewall::cast(new_state))->getManagementObject(); assert(mgmt!=NULL); +#endif data.saveAll(fwoptions); diff --git a/src/libgui/pixAdvancedDialog.cpp b/src/libgui/pixAdvancedDialog.cpp index 56d4589d9..cabd2a60f 100644 --- a/src/libgui/pixAdvancedDialog.cpp +++ b/src/libgui/pixAdvancedDialog.cpp @@ -910,9 +910,10 @@ void pixAdvancedDialog::editEpilog() void pixAdvancedDialog::setDefaultTimeoutValue(const QString &option) { string platform = obj->getStr("platform"); // could be 'pix' or 'fwsm' +#ifndef NDEBUG FWOptions *fwoptions=(Firewall::cast(obj))->getOptionsObject(); assert(fwoptions!=NULL); - +#endif string vers="version_"+obj->getStr("version"); if (option=="uauth_abs" || option=="uauth_inact") @@ -937,9 +938,10 @@ void pixAdvancedDialog::setDefaultTimeoutValue(const QString &option) void pixAdvancedDialog::defaultTimeouts() { +#ifndef NDEBUG FWOptions *fwoptions=(Firewall::cast(obj))->getOptionsObject(); assert(fwoptions!=NULL); - +#endif string vers="version_"+obj->getStr("version"); setDefaultTimeoutValue("xlate_hh" ); diff --git a/src/libgui/pixosAdvancedDialog.cpp b/src/libgui/pixosAdvancedDialog.cpp index d9ca50f08..5995e1ff2 100644 --- a/src/libgui/pixosAdvancedDialog.cpp +++ b/src/libgui/pixosAdvancedDialog.cpp @@ -66,8 +66,10 @@ pixosAdvancedDialog::pixosAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwoptions=(Firewall::cast(obj))->getOptionsObject(); assert(fwoptions!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif /* Page "General" */ data.registerOption( diff --git a/src/libgui/solarisAdvancedDialog.cpp b/src/libgui/solarisAdvancedDialog.cpp index 95bf24988..293da9a1c 100644 --- a/src/libgui/solarisAdvancedDialog.cpp +++ b/src/libgui/solarisAdvancedDialog.cpp @@ -63,8 +63,10 @@ solarisAdvancedDialog::solarisAdvancedDialog(QWidget *parent,FWObject *o) FWOptions *fwopt=(Firewall::cast(obj))->getOptionsObject(); assert(fwopt!=NULL); +#ifndef NDEBUG Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); +#endif QStringList threeStateMapping; diff --git a/src/pflib/NATCompiler_ipf.cpp b/src/pflib/NATCompiler_ipf.cpp index 53b12f78a..ba4200817 100644 --- a/src/pflib/NATCompiler_ipf.cpp +++ b/src/pflib/NATCompiler_ipf.cpp @@ -73,7 +73,9 @@ bool NATCompiler_ipf::VerifyRules::processNext() RuleElementOSrv *osrv=rule->getOSrv(); assert(osrv); RuleElementTSrc *tsrc=rule->getTSrc(); assert(tsrc); +#ifndef NDEBUG RuleElementTDst *tdst=rule->getTDst(); assert(tdst); +#endif RuleElementTSrv *tsrv=rule->getTSrv(); assert(tsrv); if (rule->getRuleType()==NATRule::DNAT && odst->size()!=1) diff --git a/src/pflib/NATCompiler_pf.cpp b/src/pflib/NATCompiler_pf.cpp index 329db6181..a5b996323 100644 --- a/src/pflib/NATCompiler_pf.cpp +++ b/src/pflib/NATCompiler_pf.cpp @@ -385,8 +385,10 @@ bool NATCompiler_pf::VerifyRules::processNext() string version = compiler->fw->getStr("version"); +#ifndef NDEBUG RuleElementOSrc *osrc=rule->getOSrc(); assert(osrc); RuleElementODst *odst=rule->getODst(); assert(odst); +#endif RuleElementOSrv *osrv=rule->getOSrv(); assert(osrv); RuleElementTSrc *tsrc=rule->getTSrc(); assert(tsrc); diff --git a/src/pflib/PolicyCompiler_ipf_writers.cpp b/src/pflib/PolicyCompiler_ipf_writers.cpp index fe71bd491..ed3752da1 100644 --- a/src/pflib/PolicyCompiler_ipf_writers.cpp +++ b/src/pflib/PolicyCompiler_ipf_writers.cpp @@ -317,9 +317,11 @@ bool PolicyCompiler_ipf::PrintRule::processNext() compiler->output << compiler->printComment(rule, current_rule_label, "#"); RuleElementSrc *srcrel=rule->getSrc(); +#ifndef NDEBUG Address *src =compiler->getFirstSrc(rule); assert(src); - RuleElementDst *dstrel=rule->getDst(); Address *dst =compiler->getFirstDst(rule); assert(dst); +#endif + RuleElementDst *dstrel=rule->getDst(); RuleElementSrv *srvrel=rule->getSrv(); Service *srv =compiler->getFirstSrv(rule); assert(srv); diff --git a/src/pflib/PolicyCompiler_ipfw_writers.cpp b/src/pflib/PolicyCompiler_ipfw_writers.cpp index 912201686..15b85f9f4 100644 --- a/src/pflib/PolicyCompiler_ipfw_writers.cpp +++ b/src/pflib/PolicyCompiler_ipfw_writers.cpp @@ -515,9 +515,11 @@ bool PolicyCompiler_ipfw::PrintRule::processNext() compiler->output << compiler->printComment(rule, current_rule_label, "#"); RuleElementSrc *srcrel=rule->getSrc(); +#ifndef NDEBUG Address *src =compiler->getFirstSrc(rule); assert(src); - RuleElementDst *dstrel=rule->getDst(); Address *dst =compiler->getFirstDst(rule); assert(dst); +#endif + RuleElementDst *dstrel=rule->getDst(); RuleElementSrv *srvrel=rule->getSrv(); Service *srv =compiler->getFirstSrv(rule); assert(srv); diff --git a/src/pflib/PolicyCompiler_pf_writers.cpp b/src/pflib/PolicyCompiler_pf_writers.cpp index 3a0c62b9f..e535e4138 100644 --- a/src/pflib/PolicyCompiler_pf_writers.cpp +++ b/src/pflib/PolicyCompiler_pf_writers.cpp @@ -70,7 +70,9 @@ using namespace std; void PolicyCompiler_pf::PrintRule::_printAction(PolicyRule *rule) { FWOptions *ruleopt = rule->getOptionsObject(); +#ifndef NDEBUG Service *srv = compiler->getFirstSrv(rule); assert(srv); +#endif string version = compiler->fw->getStr("version"); switch (rule->getAction())