onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 03:07:20 +01:00
Code Issues Releases Wiki Activity

* (many files) fixed warning " format not a string literal and no

Browse Source 
format arguments". Fixes #1285
This commit is contained in:
Vadim Kurland 2010-03-01 04:39:27 +00:00
parent 3d9181dac3
commit 405cf4cb3d
21 changed files with 104 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2637
#define BUILD_NUM 2638

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-28 vadim <vadim@vk.crocodile.org>
* (many files) fixed warning " format not a string literal and no
format arguments". Fixes #1285
2010-02-28 yalovoy <yalovoy@gmail.com>
* refs #1202: Main menu "Rules" does not match rule context menu
Items in the main menu Rules should get disabled and enabled just

9
src/gui/DialogData.cpp
View File

@ -199,8 +199,11 @@ void DialogData::saveAll(FWObject *new_obj)
QComboBox *cbx = dynamic_cast<QComboBox*>(i->w);
QString s = cbx->currentText();
if (fwbdebug)
qDebug(QString("DialogData::saveAll() QComboBox %1 (i->mapping.empty()=%2) s=%3")
.arg(i->w->objectName()).arg(i->mapping.empty()).arg(s).toAscii().constData());
qDebug() <<
QString("DialogData::saveAll() QComboBox %1 (i->mapping.empty()=%2) s=%3")
.arg(i->w->objectName())
.arg(i->mapping.empty())
.arg(s);
if ( !i->mapping.empty() && !s.isNull() )
{
@ -226,7 +229,7 @@ void DialogData::saveAll(FWObject *new_obj)
while (i1!=i->mapping.end())
{
if (fwbdebug)
qDebug(QString(" (*i1)=%1").arg(*i1).toAscii().constData());
qDebug() << " (*i1)=" << *i1;
if (s== (*i1)) { s= *i2; break; }
i1++; i1++;

4
src/gui/FWBSettings.cpp
View File

@ -161,7 +161,7 @@ void FWBSettings::init()
QDir wdir(wd);
if (!wdir.exists() && !wdir.mkdir(wd))
{
QString err= QString(QObject::tr("Working directory %1 does not exist and could not be created.\nIgnoring this setting.")).arg(wd.toLatin1().constData());
QString err = QString(QObject::tr("Working directory %1 does not exist and could not be created.\nIgnoring this setting.")).arg(wd);;
if (app != NULL)
{
@ -169,7 +169,7 @@ void FWBSettings::init()
"&Continue", 0, 0, 0 );
} else
{
qDebug( err.toAscii().constData() );
qDebug() << err;
}
setWDir("");
}

3
src/gui/FWObjectPropertiesFactory.cpp
View File

@ -33,6 +33,7 @@
#include <qtextstream.h>
#include <qdatetime.h>
#include <qregexp.h>
#include <QtDebug>
#include "FWObjectPropertiesFactory.h"
#include "platforms.h"
@ -1192,7 +1193,7 @@ QString FWObjectPropertiesFactory::getNATRuleOptions(Rule *rule)
FWOptions *ropt = rule->getOptionsObject();
if (fwbdebug)
qDebug(QString("getNATRuleOptions: platform: %2").arg(platform.c_str()).toAscii().constData());
qDebug() << "getNATRuleOptions: platform: " << platform.c_str();
if (platform=="iptables")
{

5
src/gui/FWWindowPrint.cpp
View File

@ -48,6 +48,7 @@
#include <QStatusBar>
#include <QMdiArea>
#include <QMdiSubWindow>
#include <QtDebug>
using namespace libfwbuilder;
using namespace std;
@ -307,9 +308,7 @@ void FWWindow::printFirewallFromFile(QString fileName,
}
else
{
QString errmes = "Error: can't find firewall ";
errmes += firewallName ;
qDebug (errmes.toAscii().constData());
qDebug() << "Error: can't find firewall " << firewallName;
}
}

4
src/gui/FirewallDialog.cpp
View File

@ -62,6 +62,7 @@
#include <qtimer.h>
#include <QDateTime>
#include <QUndoStack>
#include <QtDebug>
#include <iostream>
@ -178,8 +179,7 @@ void FirewallDialog::fillVersion()
for (list<QStringPair>::iterator i1=vl.begin(); i1!=vl.end(); i1++,cp++)
{
if (fwbdebug)
qDebug(QString("Adding version %1").arg(
i1->second).toAscii().constData());
qDebug() << "Adding version " << i1->second;
m_dialog->version->addItem( i1->second );
if ( v == i1->first ) m_dialog->version->setCurrentIndex( cp );

38
src/gui/IOSImporter.cpp
View File

@ -46,6 +46,8 @@
#include "fwbuilder/Policy.h"
#include "fwbuilder/RuleElement.h"
#include <QtDebug>
using namespace libfwbuilder;
IOSImporter::IOSImporter(FWObject *lib,
@ -278,8 +280,8 @@ std::pair<int,int> IOSImporter::convertPortSpec(const std::string &port_op,
std::string portspec = strip(port_spec);
if (fwbdebug)
qDebug(QString("Convert TCP/UDP port spec: port_op=%1 port_spec=%2").
arg(port_op.c_str()).arg(port_spec.c_str()).toAscii().constData());
qDebug() << QString("Convert TCP/UDP port spec: port_op=%1 port_spec=%2").
arg(port_op.c_str()).arg(port_spec.c_str());
if (portop=="" && portspec=="") return std::pair<int,int>(0, 0);
@ -400,9 +402,8 @@ Firewall* IOSImporter::finalize()
{
if (fwbdebug)
{
qDebug("Setting interface and direction for all rules");
qDebug(QString("all_rulesets.size()=%1").
arg(all_rulesets.size()).toAscii().constData());
qDebug() << "Setting interface and direction for all rules";
qDebug() << "all_rulesets.size()=" << all_rulesets.size();
}
std::map<const std::string,UnidirectionalRuleSet*>::iterator i;
@ -412,12 +413,9 @@ Firewall* IOSImporter::finalize()
if (fwbdebug)
{
qDebug(QString(" irs->name=%1").
arg(irs->name.c_str()).toAscii().constData());
qDebug(QString(" irs->intf_dir.size()=%1").
arg(irs->intf_dir.size()).toAscii().constData());
qDebug(QString(" irs->ruleset->size()=%1").
arg(irs->ruleset->size()).toAscii().constData());
qDebug() << " irs->name=" << irs->name.c_str();
qDebug() << " irs->intf_dir.size()=" << irs->intf_dir.size();
qDebug() << " irs->ruleset->size()=" << irs->ruleset->size();
}
// optimization: If we have several interfaces for
@ -501,14 +499,16 @@ Firewall* IOSImporter::finalize()
if (intf!=NULL)
{
if (fwbdebug)
qDebug(QString(" interface=%1").
arg(intf->getName().c_str()).toAscii().constData());
std::for_each(irs->ruleset->begin(),
irs->ruleset->end(),
merge_rule(irs->name,
intf,
direction,
policy)
qDebug() << " interface="
<< intf->getName().c_str();
std::for_each(
irs->ruleset->begin(),
irs->ruleset->end(),
merge_rule(irs->name,
intf,
direction,
policy)
);
}
}

22
src/gui/IPTImporter.cpp
View File

@ -59,6 +59,8 @@
#include "fwbuilder/FWServiceReference.h"
#include "fwbuilder/CustomService.h"
#include <QtDebug>
using namespace libfwbuilder;
IPTImporter::IPTImporter(FWObject *lib,
@ -272,13 +274,15 @@ FWObject* IPTImporter::createTCPUDPService(str_tuple &src_range,
{
if (fwbdebug)
{
qDebug(QString("Creating %1 service").arg(proto.c_str()).toAscii().constData());
qDebug(QString("src range: %1 - %2")
.arg(src_range.first.c_str())
.arg(src_range.second.c_str()).toAscii().constData());
qDebug(QString("dst range: %1 - %2")
.arg(dst_range.first.c_str())
.arg(dst_range.second.c_str()).toAscii().constData());
qDebug() << "Creating service " << proto.c_str();
qDebug() << "src range: "
<< src_range.first.c_str()
<< " - "
<< src_range.second.c_str();
qDebug() << "dst range: "
<< dst_range.first.c_str()
<< " - "
<< dst_range.second.c_str();
}
// std::string name = proto + " "
@ -351,7 +355,9 @@ FWObject* IPTImporter::createTCPUDPService(const std::string &proto)
std::string name = proto + " group " + s.str();
if (fwbdebug)
qDebug(QString("Group of %1 services with name '%2', sig '%3'").arg(proto.c_str()).arg(name.c_str()).arg(sig.c_str()).toAscii().constData());
qDebug() <<
QString("Group of %1 services with name '%2', sig '%3'")
.arg(proto.c_str()).arg(name.c_str()).arg(sig.c_str());
ServiceGroup *sg = ServiceGroup::cast(createObject(ServiceGroup::TYPENAME, name));
for (FWObject::iterator j=olist.begin(); j!=olist.end(); ++j)

4
src/gui/Importer.cpp
View File

@ -57,6 +57,7 @@
#include "FWBTree.h"
#include <QString>
#include <QtDebug>
using namespace libfwbuilder;
@ -862,7 +863,8 @@ FWObject* Importer::createGroupOfInterfaces(
std::for_each(interfaces.begin(), interfaces.end(), join(&sig, "_"));
if (fwbdebug)
qDebug(QString("Interface group with name '%1', sig '%2'").arg(name.c_str()).arg(sig.c_str()).toAscii().constData());
qDebug() << QString("Interface group with name '%1', sig '%2'")
.arg(name.c_str()).arg(sig.c_str());
if (all_objects.count(sig)!=0) return all_objects[sig];

15
src/gui/ObjConflictResolutionDialog.cpp
View File

@ -45,6 +45,7 @@
#include <qcheckbox.h>
#include <qpushbutton.h>
#include <qmap.h>
#include <QtDebug>
#include <iostream>
#include <sstream>
@ -387,7 +388,8 @@ int CompareObjectsDialog::run(FWObject *o1,FWObject *o2)
k = tstr.str().c_str();
}
if (fwbdebug) qDebug(QString("proplist1: k='%1' v='%2'").arg(k).arg(v).toAscii().constData());
if (fwbdebug) qDebug() << QString("proplist1: k='%1' v='%2'")
.arg(k).arg(v);
propdict1[k] = v;
}
@ -407,7 +409,8 @@ int CompareObjectsDialog::run(FWObject *o1,FWObject *o2)
k = tstr.str().c_str();
}
if (fwbdebug) qDebug(QString("proplist2: k='%1' v='%2'").arg(k).arg(v).toAscii().constData());
if (fwbdebug) qDebug() << QString("proplist2: k='%1' v='%2'")
.arg(k).arg(v);
propdict2[k] = v;
}
@ -418,7 +421,7 @@ int CompareObjectsDialog::run(FWObject *o1,FWObject *o2)
{
QString attr = *i3;
if (fwbdebug) qDebug(QString("report_attributes: attr=%1 ").arg(attr).toAscii().constData());
if (fwbdebug) qDebug() << "report_attributes: attr=" << attr;
if (!propdict1.contains(attr) || !propdict2.contains(attr)) continue;
@ -437,7 +440,8 @@ int CompareObjectsDialog::run(FWObject *o1,FWObject *o2)
QString key = mi1.key();
QString val = mi1.value();
if (fwbdebug) qDebug(QString("propdict1: key=%1 val=%2").arg(key).arg(val).toAscii().constData());
if (fwbdebug) qDebug() << QString("propdict1: key=%1 val=%2")
.arg(key).arg(val);
if (val=="") continue;
@ -459,7 +463,8 @@ int CompareObjectsDialog::run(FWObject *o1,FWObject *o2)
QString key = mi2.key();
QString val = mi2.value();
if (fwbdebug) qDebug(QString("propdict2: key=%1 val=%2").arg(key).arg(val).toAscii().constData());
if (fwbdebug) qDebug() << QString("propdict2: key=%1 val=%2")
.arg(key).arg(val);
if (val=="") continue;

13
src/gui/ObjectTreeView.cpp
View File

@ -515,12 +515,10 @@ void ObjectTreeView::mousePressEvent( QMouseEvent *e )
if (fwbdebug)
{
qDebug(QString("ObjectTreeView::mousePressEvent :: currentItem=%1")
.arg((currentItem())?currentItem()->text(0):"nil").toAscii().constData()
);
qDebug(QString("ObjectTreeView::mousePressEvent :: lastSelected=%2")
.arg((lastSelected)?lastSelected->text(0):"nil").toAscii().constData()
);
qDebug() << "ObjectTreeView::mousePressEvent :: currentItem="
<< ((currentItem())?currentItem()->text(0):"nil");
qDebug() << "ObjectTreeView::mousePressEvent :: lastSelected="
<< ((lastSelected)?lastSelected->text(0):"nil");
}
lastSelected = currentItem();
@ -679,7 +677,8 @@ void ObjectTreeView::resetSelection()
if (lastSelected)
{
if (fwbdebug)
qDebug(QString("ObjectTreeView::resetSelection :: lastSelected=%1").arg(lastSelected->text(0)).toAscii().constData());
qDebug() << "ObjectTreeView::resetSelection :: lastSelected="
<< lastSelected->text(0);
setCurrentItem(lastSelected);
lastSelected->setSelected(true);

4
src/gui/SSHCisco.cpp
View File

@ -121,7 +121,7 @@ SSHCisco::~SSHCisco()
{
}
QString SSHCisco::cmd(QProcess *proc,const QString &cmd)
QString SSHCisco::cmd(QProcess*, const QString &cmd)
{
if (fwbdebug) qDebug("Command '%s'", cmd.toAscii().constData());
sendCommand(cmd);
@ -151,7 +151,7 @@ bool SSHCisco::checkForErrors()
if ( stdoutBuffer.lastIndexOf(*i,-1)!=-1 )
{
if (fwbdebug)
qDebug(QString("Got known error message: %1").arg(stdoutBuffer).toAscii().constData());
qDebug() << "Got known error message: " << stdoutBuffer;
emit printStdout_sign( tr("\n*** Fatal error :") );
emit printStdout_sign( stdoutBuffer+"\n" );

3
src/gui/SSHUnx.cpp
View File

@ -37,6 +37,7 @@
#include <qmessagebox.h>
#include <qapplication.h>
#include <qeventloop.h>
#include <QtDebug>
#include <iostream>
@ -175,7 +176,7 @@ void SSHUnx::stateMachine()
goto push_files;
}
if (fwbdebug) qDebug(stdoutBuffer.toAscii().constData());
if (fwbdebug) qDebug() << stdoutBuffer;
QString fingerprint;
//int n1,n2;

5
src/gui/StartTipDialog.cpp
View File

@ -34,6 +34,7 @@
#include <QCheckBox>
#include <QLocale>
#include <QtDebug>
#include <stdlib.h>
@ -147,8 +148,8 @@ void StartTipDialog::downloadComplete(const QString &txt)
{
if (fwbdebug)
{
qDebug("Error connecting to the url %s", STARTUP_TIP_URL);
qDebug(http_getter->getLastError().toAscii().constData());
qDebug() << "Error connecting to the url " << STARTUP_TIP_URL;
qDebug() << http_getter->getLastError();
}
showTip(getRandomTip(), false);
}

6
src/gui/UsageResolver.cpp
View File

@ -27,7 +27,7 @@
#include "UsageResolver.h"
#include <QTime>
#include <QDebug>
#include <QtDebug>
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/RuleElement.h"
@ -153,8 +153,8 @@ list<Firewall*> UsageResolver::findFirewallsForObject(FWObject *o,
}
if (fwbdebug)
qDebug(QString("Program spent %1 ms searching for firewalls.")
.arg(tt.elapsed()).toAscii().constData());
qDebug() << QString("Program spent %1 ms searching for firewalls.")
.arg(tt.elapsed());
return fws;
}

7
src/gui/instConf.cpp
View File

@ -40,6 +40,7 @@
#include <qobject.h>
#include <qregexp.h>
#include <qsettings.h>
#include <QtDebug>
using namespace std;
using namespace libfwbuilder;
@ -52,8 +53,8 @@ instConf::instConf()
QString instConf::getCmdFromResource(const QString &resource_name)
{
if (fwbdebug)
qDebug(QString("instConf::getCmdFromResource testRun=%1 resource_name=%2").
arg(testRun).arg(resource_name).toAscii().constData());
qDebug() << QString("instConf::getCmdFromResource testRun=%1 resource_name=%2")
.arg(testRun).arg(resource_name);
string optpath_root = "activation/reg_user/";
string optpath;
@ -67,7 +68,7 @@ QString instConf::getCmdFromResource(const QString &resource_name)
optpath).c_str();
cmd = cmd.trimmed();
if (fwbdebug)
qDebug(QString("instConf::getCmdFromResource cmd=%1").arg(cmd).toAscii().constData());
qDebug() << "instConf::getCmdFromResource cmd=" << cmd;
return cmd;
}

5
src/gui/instDialog_compile.cpp
View File

@ -50,6 +50,7 @@
#include <QTimer>
#include <QMessageBox>
#include <QFile>
#include <QtDebug>
using namespace std;
using namespace libfwbuilder;
@ -59,8 +60,8 @@ bool instDialog::runCompiler(Firewall *fw)
{
if (fwbdebug)
{
qDebug("instDialog::runCompile");
qDebug(("Firewall:"+fw->getName()).c_str());
qDebug() << "instDialog::runCompile";
qDebug() << "Firewall: " << fw->getName().c_str();
}
// store pointer to the firewall so we can use it in
// slot compilerFinished

16
src/gui/instOptionsDialog.cpp
View File

@ -42,6 +42,7 @@
#include <qlayout.h>
#include <qspinbox.h>
#include <qframe.h>
#include <QtDebug>
#include <stdlib.h>
@ -178,19 +179,20 @@ instOptionsDialog::instOptionsDialog(QWidget *parent, instConf *_cnf) :
if (fwbdebug)
{
QSize sz = sizeHint();
qDebug(QString("instOptionsDialog: sizeHint: %1x%2").arg(sz.width()).arg(sz.height()).toAscii().constData());
qDebug() << QString("instOptionsDialog: sizeHint: %1x%2")
.arg(sz.width()).arg(sz.height());
sz = minimumSizeHint();
qDebug(QString("instOptionsDialog: minimumSizeHint: %1x%2").
arg(sz.width()).arg(sz.height()).toAscii().constData());
qDebug() << QString("instOptionsDialog: minimumSizeHint: %1x%2")
.arg(sz.width()).arg(sz.height());
QRect bfr;
bfr = m_dialog->titleFrame->geometry();
qDebug(QString("instOptionsDialog: titleFrame: top=%1 bottom=%2").
arg(bfr.top()).arg(bfr.bottom()).toAscii().constData());
qDebug() << QString("instOptionsDialog: titleFrame: top=%1 bottom=%2")
.arg(bfr.top()).arg(bfr.bottom());
bfr = m_dialog->buttonsFrame->geometry();
qDebug(QString("instOptionsDialog: buttonsFrame: top=%1 bottom=%2").
arg(bfr.top()).arg(bfr.bottom()).toAscii().constData());
qDebug() << QString("instOptionsDialog: buttonsFrame: top=%1 bottom=%2")
.arg(bfr.top()).arg(bfr.bottom());
}
//resize( minimumSizeHint() );

3
src/gui/platforms.cpp
View File

@ -34,6 +34,7 @@
#include <QObject>
#include <QStringList>
#include <QComboBox>
#include <QtDebug>
#include "fwbuilder/Cluster.h"
#include "fwbuilder/Firewall.h"
@ -858,7 +859,7 @@ void setPlatform(QComboBox *platform, const QString &pl)
QString current_group = "";
for (iter=platform_keys.begin(); iter!=platform_keys.end(); iter++)
{
if (fwbdebug) qDebug(iter->toLatin1().constData());
if (fwbdebug) qDebug() << *iter;
QString group = platform_mapping[*iter].first;
QString platform_name = platform_mapping[*iter].second;

7
src/gui/utils.cpp
View File

@ -38,10 +38,11 @@
#include <QHostInfo>
#include <qhostaddress.h>
#include <qpixmapcache.h>
//Added by qt3to4:
#include <QList>
#include <QPixmap>
#include <QApplication>
#include <QtDebug>
#include "FWBSettings.h"
@ -332,8 +333,8 @@ QString getAddrByName(const QString &name, int af_type)
return QString(results.front().toString().c_str());
} catch (FWException &e)
{
qDebug("utils::getAddrByName: Can not convert address to string");
qDebug(e.toString().c_str());
qDebug() << "utils::getAddrByName: Can not convert address to string";
qDebug() << e.toString().c_str();
}
return "";