1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-21 18:57:14 +01:00

bugfix: setting configlet variable firewall_name right; also small patch to remove warnings that appear when uint128.h is compiled on 64 bit systems

This commit is contained in:
Vadim Kurland 2011-04-07 14:48:55 -07:00
parent 60ba676fcc
commit bf753da2de
2 changed files with 6 additions and 2 deletions

View File

@ -463,9 +463,9 @@ public:
{
char buf[33];
if (hi)
sprintf(buf,"%llX%08llX",hi,lo);
sprintf(buf,"%llX%08llX",(unsigned long long)hi,(unsigned long long)lo);
else
sprintf(buf,"%llX",lo);
sprintf(buf,"%llX",(unsigned long long)lo);
return buf;
}

View File

@ -788,11 +788,15 @@ void FirewallInstaller::replaceMacrosInCommand(Configlet *conf)
qDebug() << " cnf->script=" << cnf->script;
qDebug() << " cnf->remote_script=" << cnf->remote_script;
qDebug() << " $fwscript=" << fwbscript;
qDebug() << " $firewall_name=" << QString::fromUtf8(
cnf->fwobj->getName().c_str());
}
conf->setVariable("fwbprompt", fwb_prompt);
conf->setVariable("fwdir", cnf->fwdir);
conf->setVariable("fwscript", fwbscript);
conf->setVariable("firewall_name",
QString::fromUtf8(cnf->fwobj->getName().c_str()));
}