Bits and pieces, mostly stubs, for the Mac port.

[u/mdw/putty] / puttymem.h

diff --git a/puttymem.h b/puttymem.h
index ba4fd0e..9fe272f 100644 (file)
--- a/puttymem.h
+++ b/puttymem.h
@@ -5,6 +5,10 @@
 #ifndef PUTTY_PUTTYMEM_H
 #define PUTTY_PUTTYMEM_H
 
+#include <stddef.h>                   /* for size_t */
+#include <string.h>                   /* for memcpy() */
+
+
 /* #define MALLOC_LOG  do this if you suspect putty of leaking memory */
 #ifdef MALLOC_LOG
 #define smalloc(z) (mlog(__FILE__,__LINE__), safemalloc(z))
@@ -21,4 +25,14 @@ void *safemalloc(size_t);
 void *saferealloc(void *, size_t);
 void safefree(void *);
 
+/*
+ * Direct use of smalloc within the code should be avoided where
+ * possible, in favour of these type-casting macros which ensure
+ * you don't mistakenly allocate enough space for one sort of
+ * structure and assign it to a different sort of pointer.
+ */
+#define snew(type) ((type *)smalloc(sizeof(type)))
+#define snewn(n, type) ((type *)smalloc((n)*sizeof(type)))
+#define sresize(ptr, n, type) ((type *)srealloc(ptr, (n)*sizeof(type)))
+
 #endif