Fix UBSAN warnings about conversions and overflows.

[tinc] / src / tincctl.h

diff --git a/src/tincctl.h b/src/tincctl.h
index 6628f2b..d09013d 100644 (file)
--- a/src/tincctl.h
+++ b/src/tincctl.h
@@ -1,3 +1,6 @@
+#ifndef TINC_TINCCTL_H
+#define TINC_TINCCTL_H
+
 /*
     tincctl.h -- header for tincctl.c.
     Copyright (C) 2011-2016 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,8 +20,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_TINCCTL_H__
-#define __TINC_TINCCTL_H__
+#include "system.h"
+#include "ecdsa.h"
 
 extern bool tty;
 extern bool force;
@@ -43,14 +46,13 @@ typedef struct {
 
 extern const var_t variables[];
 
-extern int rstrip(char *value);
+extern size_t rstrip(char *value);
 extern char *get_my_name(bool verbose);
 extern bool connect_tincd(bool verbose);
 extern bool sendline(int fd, char *format, ...);
 extern bool recvline(int fd, char *line, size_t len);
-extern int check_port(char *name);
+extern int check_port(const char *name);
 extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
 extern ecdsa_t *get_pubkey(FILE *f);
 
 #endif
-