summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
Diffstat (limited to 'node')
-rw-r--r--node/Network.cpp2
-rw-r--r--node/Utils.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index 23b32946..c024a54b 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -340,7 +340,7 @@ void Network::threadMain()
char fname[1024],lcentry[128];
Utils::snprintf(lcentry,sizeof(lcentry),"_dev_for_%.16llx",(unsigned long long)_id);
- EthernetTap *t;
+ EthernetTap *t = (EthernetTap *)0;
try {
std::string desiredDevice(_nc->getLocalConfig(lcentry));
_mkNetworkFriendlyName(fname,sizeof(fname));
diff --git a/node/Utils.hpp b/node/Utils.hpp
index 0b892cd9..affae9a8 100644
--- a/node/Utils.hpp
+++ b/node/Utils.hpp
@@ -180,7 +180,7 @@ public:
* @return Number of characters actually written
*/
static unsigned int unhex(const char *hex,unsigned int maxlen,void *buf,unsigned int len);
- static inline unsigned int unhex(const std::string &hex,void *buf,unsigned int len) { return unhex(hex.c_str(),hex.length(),buf,len); }
+ static inline unsigned int unhex(const std::string &hex,void *buf,unsigned int len) { return unhex(hex.c_str(),(unsigned int)hex.length(),buf,len); }
/**
* Generate secure random bytes