Use Gnulib's alloc functions throughout the source.

[wget] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 7d41b3148e5c3e011d9bcb1e27d9d95aca17e46c..bac112ed713d3e6cd7ffb2dd53f994550df35a25 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -31,6 +31,32 @@ as that of the covered work.  */
 #ifndef UTILS_H
 #define UTILS_H
 
+#ifdef USE_GNULIB_ALLOC
+
+/* Constant is using when we don`t know attempted size exactly */
+#define UNKNOWN_ATTEMPTED_SIZE -3
+
+/* Macros that interface to malloc, but know about type sizes, and
+   cast the result to the appropriate type.  The casts are not
+   necessary in standard C, but Wget performs them anyway for the sake
+   of pre-standard environments and possibly C++.  */
+
+#define xnew(type) (xmalloc (sizeof (type)))
+#define xnew0(type) (xcalloc (1, sizeof (type)))
+#define xnew_array(type, len) (xmalloc ((len) * sizeof (type)))
+#define xnew0_array(type, len) (xcalloc ((len), sizeof (type)))
+
+#define alloca_array(type, size) ((type *) alloca ((size) * sizeof (type)))
+
+#define xfree free
+/* Free P if it is non-NULL.  C requires free() to behaves this way by
+   default, but Wget's code is historically careful not to pass NULL
+   to free.  This allows us to assert p!=NULL in xfree to check
+   additional errors.  (But we currently don't do that!)  */
+#define xfree_null(p) if (!(p)) ; else xfree (p)
+
+#endif /* USE_GNULIB_ALLOC */
+
 struct hash_table;
 
 struct file_memory {