Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index cbf3bea..a0107d0 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -32,7 +32,6 @@
 #include "names.h"
 #include "netutl.h"             /* for str2address */
 #include "protocol.h"
-#include "utils.h"              /* for cp */
 #include "xalloc.h"
 
 splay_tree_t *config_tree = NULL;
@@ -204,7 +203,7 @@ static char *readline(FILE *fp, char *buf, size_t buflen) {
                return NULL;
        }
 
-       p = fgets(buf, buflen, fp);
+       p = fgets(buf, (int) buflen, fp);
 
        if(!p) {
                return NULL;
@@ -228,7 +227,6 @@ static char *readline(FILE *fp, char *buf, size_t buflen) {
 
 config_t *parse_config_line(char *line, const char *fname, int lineno) {
        config_t *cfg;
-       int len;
        char *variable, *value, *eol;
        variable = value = line;
 
@@ -238,7 +236,7 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) {
                *eol = '\0';
        }
 
-       len = strcspn(value, "\t =");
+       size_t len = strcspn(value, "\t =");
        value += len;
        value += strspn(value, "\t ");