From: Mateusz Malicki <m.malicki2@samsung.com>
Date: Wed, 25 Mar 2015 13:46:14 +0000 (+0100)
Subject: FIX: compile on x86_64, operator << instead + in log message.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F37390%2F3;p=platform%2Fcore%2Fsecurity%2Fvasum.git

FIX: compile on x86_64, operator << instead + in log message.

[Bug/Feature]   Doesn't compile on x86_84 (conversion warning),
                operator << instead + in log message
[Cause]         N/A
[Solution]      N/A
[Verification]  compile on x86_64 (f.e. tizenorg_common_x86_64_x11)

Change-Id: I51e51297eec860c65a19810ea1d4feead7c1d3a8
---

diff --git a/common/netlink/netlink-message.cpp b/common/netlink/netlink-message.cpp
index ac42c58..c64199a 100644
--- a/common/netlink/netlink-message.cpp
+++ b/common/netlink/netlink-message.cpp
@@ -232,7 +232,7 @@ const char* NetlinkResponse::get(int ifla, int len) const
         throw VasumException("Wrong attribute type");
     }
     if (len >= 0 && rta->rta_len != RTA_LENGTH(len)) {
-        LOGE("Wrong attribute length, expected: " << rta->rta_len + ", got " << len);
+        LOGE("Wrong attribute length, expected: " << rta->rta_len << ", got " << len);
         throw VasumException("Wrong attribute length");
     }
     return reinterpret_cast<const char*>(RTA_DATA(get(rta->rta_len)));
diff --git a/common/netlink/netlink-message.hpp b/common/netlink/netlink-message.hpp
index 6b84de4..971e6ad 100644
--- a/common/netlink/netlink-message.hpp
+++ b/common/netlink/netlink-message.hpp
@@ -149,7 +149,7 @@ public:
     /**
      * Fetch attribute
      */
-    NetlinkResponse& fetch(int ifla, std::string& value, int maxSize = std::string::npos);
+    NetlinkResponse& fetch(int ifla, std::string& value, int maxSize = -1);
     template<class T>
     NetlinkResponse& fetch(int ifla, T& value);
     ///@}