Fix a potential NULL-pointer dereference when generating invitations.

[meshlink] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 46f1c89e68f2e0365f4b610270e02ca853fd9f0e..fd48ea64feb515b8cd94cf34a2cb70aed687b7db 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_CONF_H
+#define MESHLINK_CONF_H
+
 /*
     conf.h -- header for conf.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_CONF_H__
-#define __MESHLINK_CONF_H__
-
 #include "list.h"
 #include "meshlink_internal.h"
 #include "splay_tree.h"
@@ -33,7 +33,7 @@ typedef struct config_t {
 
 extern void init_configuration(struct splay_tree_t **);
 extern void exit_configuration(struct splay_tree_t **);
-extern config_t *new_config(void) __attribute__ ((__malloc__));
+extern config_t *new_config(void) __attribute__((__malloc__));
 extern void free_config(config_t *);
 extern void config_add(struct splay_tree_t *, config_t *);
 extern config_t *lookup_config(struct splay_tree_t *, char *);
@@ -52,7 +52,7 @@ extern bool write_config_file(const struct splay_tree_t *, const char *);
 extern bool read_server_config(struct meshlink_handle *mesh);
 extern bool read_host_config(struct meshlink_handle *mesh, struct splay_tree_t *, const char *);
 extern bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *, const char *);
-extern bool modify_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *, bool);
-extern bool append_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *);
+extern bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim);
+extern bool append_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value);
 
-#endif /* __MESHLINK_CONF_H__ */
+#endif