Get rid of capacity argument to ds_init() and update all callers.

[pspp] / src / libpspp / pool.h

diff --git a/src/libpspp/pool.h b/src/libpspp/pool.h
index f2b01fe195522cdf0467ae65f1d2e515c8371b16..fe4af29b73c4bcdccc77d1df03d8de21944c1432 100644 (file)
--- a/src/libpspp/pool.h
+++ b/src/libpspp/pool.h
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
 #if !pool_h
 #define pool_h 1
 
+#include <stdarg.h>
 #include <stdio.h>
 #include "compiler.h"
 
@@ -63,7 +64,10 @@ void *pool_clone (struct pool *, const void *, size_t) MALLOC_LIKE;
 void *pool_alloc_unaligned (struct pool *, size_t) MALLOC_LIKE;
 void *pool_clone_unaligned (struct pool *, const void *, size_t) MALLOC_LIKE;
 char *pool_strdup (struct pool *, const char *) MALLOC_LIKE;
-char *pool_strcat (struct pool *, const char *, ...) MALLOC_LIKE;
+char *pool_vasprintf (struct pool *, const char *, va_list) 
+     MALLOC_LIKE PRINTF_FORMAT (2, 0);
+char *pool_asprintf (struct pool *, const char *, ...)
+     MALLOC_LIKE PRINTF_FORMAT (2, 3);
 
 /* Standard allocation routines. */
 void *pool_malloc (struct pool *, size_t) MALLOC_LIKE;
@@ -79,7 +83,7 @@ void pool_add_subpool (struct pool *, struct pool *subpool);
 
 /* Files. */
 FILE *pool_fopen (struct pool *, const char *, const char *);
-int pool_fclose (struct pool *, FILE *);
+int pool_fclose (struct pool *, FILE *) WARN_UNUSED_RESULT;
 FILE *pool_tmpfile (struct pool *);
 void pool_attach_file (struct pool *, FILE *);
 void pool_detach_file (struct pool *, FILE *);