4 files changed, 14 insertions, 15 deletions

diff --git a/hicn-light/src/core/forwarder.c b/hicn-light/src/core/forwarder.c
index f3af85d6c..bceb206a3 100644
--- a/hicn-light/src/core/forwarder.c
+++ b/hicn-light/src/core/forwarder.c
@@ -201,7 +201,7 @@ Forwarder *forwarder_Create(Logger *logger) {
   forwarder->hicnSocketHelper = hicn_create();
   if (forwarder->hicnSocketHelper == NULL) return NULL;
 #endif /* __APPLE__ */
-    /* ignore child */
+       /* ignore child */
 #ifndef _WIN32
   signal(SIGCHLD, SIG_IGN);
 
diff --git a/hicn-light/src/core/mapMe.c b/hicn-light/src/core/mapMe.c
index 16e631c0f..d5ed08bfb 100644
--- a/hicn-light/src/core/mapMe.c
+++ b/hicn-light/src/core/mapMe.c
@@ -65,8 +65,7 @@
 
 #define WARN(mapme, fmt, ...) \
   LOG(mapme, PARCLogLevel_Warning, fmt, ##__VA_ARGS__)
-#define ERROR(mapme, fmt, ...) \
-  LOG(mapme, PARCLogLevel_Error, fmt, ##__VA_ARGS__)
+#define ERR(mapme, fmt, ...) LOG(mapme, PARCLogLevel_Error, fmt, ##__VA_ARGS__)
 #define INFO(mapme, fmt, ...) LOG(mapme, PARCLogLevel_Info, fmt, ##__VA_ARGS__)
 #define DEBUG(mapme, fmt, ...) \
   LOG(mapme, PARCLogLevel_Debug, fmt, ##__VA_ARGS__)
@@ -234,14 +233,14 @@ static Message *mapMe_createMessage(const MapMe *mapme, const Name *name,
   hicn_prefix_t prefix;
   int rc = hicn_prefix_from_name(name, &prefix);
   if (rc < 0) {
-    ERROR(mapme, "[MAP-Me] Failed to create lib's name");
+    ERR(mapme, "[MAP-Me] Failed to create lib's name");
     goto ERR_NAME;
   }
 
   INFO(mapme, "[MAP-Me] Creating MAP-Me packet");
   size_t len = hicn_mapme_create_packet(icmp_pkt, &prefix, params);
   if (len != 0) {
-    ERROR(mapme, "[MAP-Me] Failed to create mapme packet through lib");
+    ERR(mapme, "[MAP-Me] Failed to create mapme packet through lib");
     goto ERR_CREATE;
   }
 
@@ -268,7 +267,7 @@ static Message *mapMe_createAckMessage(const MapMe *mapme,
 
   size_t len = hicn_mapme_create_ack(icmp_pkt, params);
   if (len != size) {
-    ERROR(mapme, "[MAP-Me] Failed to create mapme ack packet through lib");
+    ERR(mapme, "[MAP-Me] Failed to create mapme ack packet through lib");
     return NULL;
   }
 
diff --git a/hicn-light/src/core/message.c b/hicn-light/src/core/message.c
index 6c0e916d2..9b807aebc 100644
--- a/hicn-light/src/core/message.c
+++ b/hicn-light/src/core/message.c
@@ -66,7 +66,7 @@ Message *message_CreateFromEventBuffer(PARCEventBuffer *data, size_t dataLength,
   message->logger = logger_Acquire(logger);
   message->receiveTime = receiveTime;
   message->ingressConnectionId = ingressConnectionId;
-  message->length = dataLength;
+  message->length = (unsigned int)dataLength;
 
   message->messageHead = parcMemory_AllocateAndClear(dataLength);
   parcAssertNotNull(message->messageHead,
@@ -173,7 +173,7 @@ bool message_IsWldrNotification(const Message *message) {
 
 void message_ResetWldrLabel(Message *message) {
   parcAssertNotNull(message, "Parameter must be non-null");
-  return messageHandler_ResetWldrLabel(message->messageHead);
+  messageHandler_ResetWldrLabel(message->messageHead);
 }
 
 unsigned message_GetWldrLabel(const Message *message) {
@@ -207,7 +207,7 @@ Message *message_CreateWldrNotification(Message *original, uint16_t expected,
   message->refcount = 1;
   message->logger = logger_Acquire(original->logger);
 
-  message->length = messageHandler_GetICMPPacketSize(
+  message->length = (unsigned int)messageHandler_GetICMPPacketSize(
       messageHandler_GetIPPacketType(original->messageHead));
   message->messageHead = parcMemory_AllocateAndClear(message->length);
   parcAssertNotNull(message->messageHead,
@@ -246,7 +246,7 @@ uint32_t message_GetPathLabel(const Message *message) {
 
 void message_SetPathLabel(Message *message, uint32_t label) {
   parcAssertNotNull(message, "Parameter must be non-null");
-  return messageHandler_SetPathLabel(message->messageHead, label);
+  messageHandler_SetPathLabel(message->messageHead, label);
 }
 
 void message_UpdatePathLabel(Message *message, uint8_t outFace) {
diff --git a/hicn-light/src/core/nameBitvector.c b/hicn-light/src/core/nameBitvector.c
index c93f63292..28ea513c4 100644
--- a/hicn-light/src/core/nameBitvector.c
+++ b/hicn-light/src/core/nameBitvector.c
@@ -209,7 +209,7 @@ bool nameBitvector_StartsWith(const NameBitvector *name,
 bool nameBitvector_testBit(const NameBitvector *name, uint8_t pos) {
   if (pos == WIDTH) pos = 127;
 
-  uint8_t final_pos = WIDTH - name->len;
+  uint8_t final_pos = (uint8_t)(WIDTH - name->len);
 
   // the bit to test is inside the name/prefix len
   if (pos > final_pos) {
@@ -262,9 +262,9 @@ uint8_t nameBitvector_firstDiff(const NameBitvector *a,
   uint8_t res = 0;
   uint64_t diff = a->bits[1] ^ b->bits[1];
   if (diff)
-    res = 64 + _diff_bit_log2(diff);
+    res = (uint8_t)(64 + _diff_bit_log2(diff));
   else
-    res = _diff_bit_log2(a->bits[0] ^ b->bits[0]);
+    res = (uint8_t)_diff_bit_log2(a->bits[0] ^ b->bits[0]);
 
   // res is computed over the bitvector which is composed by 128 bit all the
   // times however the prefixes may be diffrent just because the have different
@@ -275,9 +275,9 @@ uint8_t nameBitvector_firstDiff(const NameBitvector *a,
 
   uint8_t len_diff;
   if (a->len < b->len)
-    len_diff = WIDTH - a->len;
+    len_diff = (uint8_t)(WIDTH - a->len);
   else
-    len_diff = WIDTH - b->len;
+    len_diff = (uint8_t)(WIDTH - b->len);
 
   if (len_diff > res) res = len_diff;