From bf753da2de0f589c0d41586199e37cc5f0d73036 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 7 Apr 2011 14:48:55 -0700 Subject: [PATCH] bugfix: setting configlet variable firewall_name right; also small patch to remove warnings that appear when uint128.h is compiled on 64 bit systems --- src/libfwbuilder/src/fwbuilder/uint128.h | 4 ++-- src/libgui/FirewallInstaller.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h index aed8998e3..4669924a8 100644 --- a/src/libfwbuilder/src/fwbuilder/uint128.h +++ b/src/libfwbuilder/src/fwbuilder/uint128.h @@ -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; } diff --git a/src/libgui/FirewallInstaller.cpp b/src/libgui/FirewallInstaller.cpp index b4096e582..733d42e53 100644 --- a/src/libgui/FirewallInstaller.cpp +++ b/src/libgui/FirewallInstaller.cpp @@ -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())); }