refactor: Disable unused variables in production code

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);
 

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);
 

src/cisco_lib/NATCompiler_pix_find_translations.cpp

@@ -100,7 +100,9 @@ list<NATRule*> 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);
 

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<int,NATCmd*>::iterator i=pix_comp->nat_commands.begin(); 
              i!=pix_comp->nat_commands.end(); ++i)

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);
@@ -262,9 +264,11 @@ void NATCompiler_pix::PrintRule::printSNAT(NATRule *rule)
     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);

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");

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();
 

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
             {

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();

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);

src/iptlib/PolicyCompiler_PrintRule.cpp

@@ -558,8 +558,10 @@ string PolicyCompiler_ipt::PrintRule::_printActionOnReject(PolicyRule *rule)
     PolicyCompiler_ipt *ipt_comp = dynamic_cast<PolicyCompiler_ipt*>(compiler);
 
 //    RuleElementSrv *srvrel=rule->getSrv();
+#ifndef NDEBUG
     Service *srv = compiler->getFirstSrv(rule);
     assert(srv);
+#endif
 
     string s = ipt_comp->getActionOnReject(rule);
     if (!s.empty()) 

src/iptlib/PolicyCompiler_ipt.cpp

@@ -916,7 +916,9 @@ bool PolicyCompiler_ipt::Logging2::processNext()
     PolicyCompiler_ipt *ipt_comp = dynamic_cast<PolicyCompiler_ipt*>(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())

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) 
     {

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<AddressRange*>(obj);
     assert(s!=NULL);
+#endif
     try
     {
         InetAddr range_start(AF_UNSPEC, m_dialog->rangeStart->text().toLatin1().constData());

src/libgui/AddressTableDialog.cpp

@@ -116,8 +116,11 @@ void AddressTableDialog::updateButtons()
 void AddressTableDialog::validate(bool *res)
 {
     *res=true;
+
+#ifndef NDEBUG
     AddressTable *s = dynamic_cast<AddressTable*>(obj);
     assert(s!=NULL);
+#endif
 
     if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; }
 }

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<AttachedNetworks*>(obj);
     assert(s!=NULL);
+#endif
 
     if (!validateName(this, obj, m_dialog->obj_name->text()))
     {
@@ -144,8 +147,10 @@ void AttachedNetworksDialog::applyChanges()
     std::auto_ptr<FWCmdChange> cmd( new FWCmdChange(m_project, obj));
     FWObject* new_state = cmd->getNewState();
 
+#ifndef NDEBUG
     AttachedNetworks *s = dynamic_cast<AttachedNetworks*>(new_state);
     assert(s!=NULL);
+#endif
 
     string oldname = obj->getName();
     new_state->setName(string(m_dialog->obj_name->text().toUtf8().constData()));

src/libgui/ClusterGroupDialog.cpp

@@ -279,8 +279,10 @@ void ClusterGroupDialog::applyChanges()
     std::auto_ptr<FWCmdChange> cmd( new FWCmdChange(m_project, obj));
     FWObject* new_state = cmd->getNewState();
 
+#ifndef NDEBUG
     ClusterGroup *g = dynamic_cast<ClusterGroup*>(new_state);
     assert(g != NULL);
+#endif
 
     QString oldname = obj->getName().c_str();
     new_state->setName(string(m_dialog->obj_name->text().toUtf8().constData()));

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<DNSName*>(obj);
     assert(s!=NULL);
-
+#endif
     if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; }
 }
 

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<Firewall*>(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());

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<Host*>(new_state);
     assert(s!=NULL);
 
+#ifndef NDEBUG
     Management *mgmt = s->getManagementObject();
     assert(mgmt!=NULL);
+#endif
 
     FWOptions  *opt =s->getOptionsObject();
 

src/libgui/IPv4Dialog.cpp

@@ -137,8 +137,11 @@ void IPv4Dialog::validate(bool *result)
         return;
     }
 
+#ifndef NDEBUG
     IPv4 *s = dynamic_cast<IPv4*>(obj);
     assert(s!=NULL);
+#endif
+
     try
     {
         InetAddr( m_dialog->address->text().trimmed().toLatin1().constData() );

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<IPv6*>(obj);
     assert(s!=NULL);
+#endif
+
     try
     {
         InetAddr(AF_INET6, m_dialog->address->text().trimmed().toLatin1().constData() );

src/libgui/NetworkDialog.cpp

@@ -128,8 +128,11 @@ void NetworkDialog::validate(bool *result)
         return;
     }
 
+#ifndef NDEBUG
     Network *s = dynamic_cast<Network*>(obj);
     assert(s!=NULL);
+#endif
+
     try
     {
         InetAddr( m_dialog->address->text().toStdString() );

src/libgui/NetworkDialogIPv6.cpp

@@ -111,8 +111,11 @@ void NetworkDialogIPv6::validate(bool *res)
         return;
     }
 
+#ifndef NDEBUG
     NetworkIPv6 *s = dynamic_cast<NetworkIPv6*>(obj);
     assert(s != NULL);
+#endif
+
     try
     {
         InetAddr(AF_INET6, m_dialog->address->text().toStdString() );

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();

src/libgui/ObjectManipulator_ops.cpp

@@ -91,8 +91,10 @@ 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)))

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<TagService*>(obj);
     assert(s!=NULL);
-
+#endif
     if (!validateName(this,obj,m_dialog->obj_name->text())) { *res=false; return; }
 }
 

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<UserService*>(obj);
     assert(s!=NULL);
+#endif
 }
 
 

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;
 

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" );

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;
 

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" );

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(

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);
 

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;
 

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" );

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);
 

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"       );

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(

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;
 

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)

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);

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);
 

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);
 

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())