From 3fb011cae4eea4cf48e7e21facb060e1c74ba68b Mon Sep 17 00:00:00 2001 From: "Srivats P." Date: Mon, 8 Nov 2010 14:21:41 +0530 Subject: [PATCH] Fixed warnings --- common/gmp.cpp | 2 +- common/ip6.cpp | 4 ++-- common/iputils.h | 3 ++- common/mld.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/gmp.cpp b/common/gmp.cpp index e19b54c..7bc7ced 100755 --- a/common/gmp.cpp +++ b/common/gmp.cpp @@ -192,7 +192,7 @@ void GmpConfigForm::on_auxData_textChanged(const QString &text) { // auxDataLength is in units of words and each byte is 2 chars in text() if (!overrideAuxDataLength->isChecked()) - auxDataLength->setText(QString().setNum((auxData->text().size()+7)/8)); + auxDataLength->setText(QString().setNum((text.size()+7)/8)); } GmpProtocol::GmpProtocol(StreamBase *stream, AbstractProtocol *parent) diff --git a/common/ip6.cpp b/common/ip6.cpp index f8b7555..fe5d29b 100644 --- a/common/ip6.cpp +++ b/common/ip6.cpp @@ -359,7 +359,7 @@ QVariant Ip6Protocol::fieldData(int index, FieldAttrib attrib, int u, p, q; quint64 maskHi = 0, maskLo = 0; quint64 prefixHi, prefixLo; - quint64 hostHi, hostLo; + quint64 hostHi = 0, hostLo = 0; quint64 srcHi = 0, srcLo = 0; switch(data.src_addr_mode()) @@ -433,7 +433,7 @@ QVariant Ip6Protocol::fieldData(int index, FieldAttrib attrib, int u, p, q; quint64 maskHi = 0, maskLo = 0; quint64 prefixHi, prefixLo; - quint64 hostHi, hostLo; + quint64 hostHi = 0, hostLo = 0; quint64 dstHi = 0, dstLo = 0; switch(data.dst_addr_mode()) diff --git a/common/iputils.h b/common/iputils.h index 73ff488..0d6a067 100644 --- a/common/iputils.h +++ b/common/iputils.h @@ -60,6 +60,7 @@ quint32 inline ipAddress(quint32 baseIp, int prefix, AddrMode mode, int count, ip = subnet | host; break; default: + ip = 0; qWarning("Unhandled mode = %d", mode); } @@ -72,7 +73,7 @@ void inline ipAddress(quint64 baseIpHi, quint64 baseIpLo, int prefix, int u, p, q; quint64 maskHi = 0, maskLo = 0; quint64 prefixHi, prefixLo; - quint64 hostHi, hostLo; + quint64 hostHi = 0, hostLo = 0; switch(mode) { diff --git a/common/mld.cpp b/common/mld.cpp index 11a9649..98feab5 100644 --- a/common/mld.cpp +++ b/common/mld.cpp @@ -232,7 +232,7 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib, } case kGroupAddress: { - quint64 grpHi, grpLo; + quint64 grpHi = 0, grpLo = 0; ipUtils::ipAddress( data.group_address().v6_hi(),