From b10871cedcdaa6f18779fcebcc889cdd35df546b Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 18 Oct 2013 11:01:41 -0400
Subject: More work in netconf cleanup.

---
 node/MAC.hpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'node/MAC.hpp')

diff --git a/node/MAC.hpp b/node/MAC.hpp
index 9765aa59..b1864511 100644
--- a/node/MAC.hpp
+++ b/node/MAC.hpp
@@ -135,17 +135,9 @@ public:
 	 * @param s String hex representation (with or without :'s)
 	 * @return True if string decoded into a full-length MAC
 	 */
-	inline bool fromString(const char *s)
+	inline void fromString(const char *s)
 	{
-		std::string b(Utils::unhex(s));
-		if (b.length() == 6) {
-			for(unsigned int i=0;i<6;++i)
-				data[i] = (unsigned char)b[i];
-			return true;
-		}
-		for(unsigned int i=0;i<6;++i)
-			data[i] = 0;
-		return false;
+		Utils::unhex(s,data,6);
 	}
 
 	inline std::string toString() const
-- 
cgit v1.2.3