projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use macros from cast.h instead of literal casts
[pspp]
/
src
/
libpspp
/
pool.h
diff --git
a/src/libpspp/pool.h
b/src/libpspp/pool.h
index bc60e3a7a297928faff5dd0330e2aeafcd15aa46..da95f4ec7ca243066987820128123a082020cfb3 100644
(file)
--- a/
src/libpspp/pool.h
+++ b/
src/libpspp/pool.h
@@
-1,20
+1,18
@@
-/* PSPP -
computes sample statistic
s.
- Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+/* PSPP -
a program for statistical analysi
s.
+ Copyright (C) 2000, 2006
, 2010
Free Software Foundation, Inc.
- 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 the Free Software Foundation; either version 2 of the
-
License, or
(at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program 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.
+ This program 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
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#if !pool_h
#define pool_h 1
#if !pool_h
#define pool_h 1
@@
-33,7
+31,7
@@
/* Records the state of a pool for later restoration. */
/* Records the state of a pool for later restoration. */
-struct pool_mark
+struct pool_mark
{
/* Current block and offset into it. */
struct pool_block *block;
{
/* Current block and offset into it. */
struct pool_block *block;
@@
-64,7
+62,8
@@
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;
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_vasprintf (struct pool *, const char *, va_list)
+char *pool_strdup0 (struct pool *, const char *, size_t) 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);
MALLOC_LIKE PRINTF_FORMAT (2, 0);
char *pool_asprintf (struct pool *, const char *, ...)
MALLOC_LIKE PRINTF_FORMAT (2, 3);
@@
-86,10
+85,15
@@
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 *) WARN_UNUSED_RESULT;
/* Files. */
FILE *pool_fopen (struct pool *, const char *, const char *);
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 *);
void pool_attach_file (struct pool *, FILE *);
void pool_detach_file (struct pool *, FILE *);
+/* Temporary files. */
+FILE *pool_create_temp_file (struct pool *);
+void pool_fclose_temp_file (struct pool *, FILE *);
+void pool_attach_temp_file (struct pool *, FILE *);
+void pool_detach_temp_file (struct pool *, FILE *);
+
/* Custom allocations. */
void pool_register (struct pool *, void (*free) (void *), void *p);
bool pool_unregister (struct pool *, void *);
/* Custom allocations. */
void pool_register (struct pool *, void (*free) (void *), void *p);
bool pool_unregister (struct pool *, void *);