Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / names.c

diff --git a/src/names.c b/src/names.c
index 603b536..c9318fa 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -50,6 +50,8 @@ void make_names(bool daemon) {
                logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
        }
 
+       free(identname);
+
        if(netname) {
                xasprintf(&identname, "tinc.%s", netname);
        } else {
@@ -148,7 +150,7 @@ void make_names(bool daemon) {
 #endif
 
        if(!unixsocketname) {
-               int len = strlen(pidfilename);
+               size_t len = strlen(pidfilename);
                unixsocketname = xmalloc(len + 8);
                memcpy(unixsocketname, pidfilename, len);