diff --git a/src/core/ddsi/src/q_ddsi_discovery.c b/src/core/ddsi/src/q_ddsi_discovery.c
index 655a31b..730d2b1 100644
--- a/src/core/ddsi/src/q_ddsi_discovery.c
+++ b/src/core/ddsi/src/q_ddsi_discovery.c
@@ -1016,7 +1016,7 @@ static const char *durability_to_string (nn_durability_kind_t k)
     case NN_TRANSIENT_DURABILITY_QOS: return "transient";
     case NN_PERSISTENT_DURABILITY_QOS: return "persistent";
   }
-  abort (); return 0;
+  return "undefined-durability";
 }
 
 static struct proxy_participant *implicitly_create_proxypp (const nn_guid_t *ppguid, nn_plist_t *datap /* note: potentially modifies datap */, const nn_guid_prefix_t *src_guid_prefix, nn_vendorid_t vendorid, nn_wctime_t timestamp)
diff --git a/src/core/ddsi/src/q_entity.c b/src/core/ddsi/src/q_entity.c
index 44b76ff..78009c8 100644
--- a/src/core/ddsi/src/q_entity.c
+++ b/src/core/ddsi/src/q_entity.c
@@ -248,16 +248,12 @@ nn_vendorid_t get_entity_vendorid (const struct entity_common *e)
     case EK_READER:
     case EK_WRITER:
       return (nn_vendorid_t) MY_VENDOR_ID;
-      break;
     case EK_PROXY_PARTICIPANT:
       return ((const struct proxy_participant *) e)->vendor;
-      break;
     case EK_PROXY_READER:
       return ((const struct proxy_reader *) e)->c.vendor;
-      break;
     case EK_PROXY_WRITER:
       return ((const struct proxy_writer *) e)->c.vendor;
-      break;
   }
   assert (0);
   return (nn_vendorid_t) NN_VENDORID_UNKNOWN;
diff --git a/src/core/ddsi/src/q_nwif.c b/src/core/ddsi/src/q_nwif.c
index 0db1e12..605858b 100644
--- a/src/core/ddsi/src/q_nwif.c
+++ b/src/core/ddsi/src/q_nwif.c
@@ -56,29 +56,6 @@ unsigned locator_to_hopefully_unique_uint32 (const nn_locator_t *src)
   return id;
 }
 
-unsigned short get_socket_port (os_socket socket)
-{
-  os_sockaddr_storage addr;
-  socklen_t addrlen = sizeof (addr);
-  if (getsockname (socket, (os_sockaddr *) &addr, &addrlen) < 0)
-  {
-    print_sockerror ("getsockname");
-    return 0;
-  }
-  switch (addr.ss_family)
-  {
-    case AF_INET:
-      return ntohs (((os_sockaddr_in *) &addr)->sin_port);
-#if OS_SOCKET_HAS_IPV6
-    case AF_INET6:
-      return ntohs (((os_sockaddr_in6 *) &addr)->sin6_port);
-#endif
-    default:
-      abort ();
-      return 0;
-  }
-}
-
 #ifdef DDSI_INCLUDE_NETWORK_CHANNELS
 void set_socket_diffserv (os_socket sock, int diffserv)
 {
diff --git a/src/tools/pubsub/pubsub.c b/src/tools/pubsub/pubsub.c
index 7f52f58..1b460c2 100644
--- a/src/tools/pubsub/pubsub.c
+++ b/src/tools/pubsub/pubsub.c
@@ -2308,7 +2308,6 @@ int MAIN(int argc, char *argv[]) {
                             qpublisher[nqpublisher++] = q;
                             qsubscriber[nqsubscriber++] = q;
                             break;
-                            break;
                         default:
                             assert(0);
                         }