X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/9c44ef13ed639445ee2e8a4037f7b3c5fcc11aa2..eff48c1250f7f654a00495c5048766a9261c64ce:/secnet.h

diff --git a/secnet.h b/secnet.h
index 96717ae..63307ac 100644
--- a/secnet.h
+++ b/secnet.h
@@ -1,4 +1,22 @@
 /* Core interface of secnet, to be used by all modules */
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
 
 #ifndef secnet_h
 #define secnet_h
@@ -153,6 +171,8 @@ extern uint32_t dict_read_number(dict_t *dict, cstring_t key, bool_t required,
   /* return value can safely be assigned to int32_t */
 extern bool_t dict_read_bool(dict_t *dict, cstring_t key, bool_t required,
 			     cstring_t desc, struct cloc loc, bool_t def);
+extern dict_t *dict_read_dict(dict_t *dict, cstring_t key, bool_t required,
+			cstring_t desc, struct cloc loc);
 const char **dict_read_string_array(dict_t *dict, cstring_t key,
 				    bool_t required, cstring_t desc,
 				    struct cloc loc, const char *const *def);
@@ -180,6 +200,16 @@ extern void *safe_malloc_ary(size_t size, size_t count, const char *message);
 extern void *safe_realloc_ary(void *p, size_t size, size_t count,
 			      const char *message);
 
+#define NEW(p)					\
+    ((p)=safe_malloc(sizeof(*(p)),		\
+		     __FILE__ ":" #p))
+#define NEW_ARY(p,count)					\
+    ((p)=safe_malloc_ary(sizeof(*(p)),(count),			\
+			 __FILE__ ":" #p "[" #count "]"))
+#define REALLOC_ARY(p,count)					\
+    ((p)=safe_realloc_ary((p),sizeof(*(p)),(count),		\
+			  __FILE__ ":" #p "[" #count "]"))
+
 void setcloexec(int fd); /* cannot fail */
 void setnonblock(int fd); /* cannot fail */
 void pipe_cloexec(int fd[2]); /* pipe(), setcloexec() twice; cannot fail */