From 1b6ca83117ed42208bcf4aeac18c316f7a800d18 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Mon, 22 Apr 2002 01:37:54 +0000 Subject: [PATCH] Splint cleanups on memory allocation routines. svn path=/trunk/yasm/; revision=593 --- libyasm/util.h | 7 ++++--- src/util.h | 7 ++++--- util.h | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libyasm/util.h b/libyasm/util.h index 3ec1970c..a4fc61e7 100644 --- a/libyasm/util.h +++ b/libyasm/util.h @@ -129,9 +129,10 @@ int strncasecmp(const char *s1, const char *s2, size_t n); /* Error-checking memory allocation routines in xmalloc.c. */ /*@only@*/ /*@out@*/ void *xmalloc(size_t size); -/*@only@*/ /*@out@*/ void *xcalloc(size_t nelem, size_t elsize); -/*@out@*/ void *xrealloc(/*@returned@*/ /*@null@*/ void *oldmem, size_t size); -void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p); +/*@only@*/ void *xcalloc(size_t nelem, size_t elsize); +/*@only@*/ void *xrealloc(/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ + void *oldmem, size_t size) /*@modifies oldmem@*/; +void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) /*@modifies p@*/; #endif /* Bit-counting: used primarily by HAMT but also in a few other places. */ diff --git a/src/util.h b/src/util.h index 3ec1970c..a4fc61e7 100644 --- a/src/util.h +++ b/src/util.h @@ -129,9 +129,10 @@ int strncasecmp(const char *s1, const char *s2, size_t n); /* Error-checking memory allocation routines in xmalloc.c. */ /*@only@*/ /*@out@*/ void *xmalloc(size_t size); -/*@only@*/ /*@out@*/ void *xcalloc(size_t nelem, size_t elsize); -/*@out@*/ void *xrealloc(/*@returned@*/ /*@null@*/ void *oldmem, size_t size); -void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p); +/*@only@*/ void *xcalloc(size_t nelem, size_t elsize); +/*@only@*/ void *xrealloc(/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ + void *oldmem, size_t size) /*@modifies oldmem@*/; +void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) /*@modifies p@*/; #endif /* Bit-counting: used primarily by HAMT but also in a few other places. */ diff --git a/util.h b/util.h index 3ec1970c..a4fc61e7 100644 --- a/util.h +++ b/util.h @@ -129,9 +129,10 @@ int strncasecmp(const char *s1, const char *s2, size_t n); /* Error-checking memory allocation routines in xmalloc.c. */ /*@only@*/ /*@out@*/ void *xmalloc(size_t size); -/*@only@*/ /*@out@*/ void *xcalloc(size_t nelem, size_t elsize); -/*@out@*/ void *xrealloc(/*@returned@*/ /*@null@*/ void *oldmem, size_t size); -void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p); +/*@only@*/ void *xcalloc(size_t nelem, size_t elsize); +/*@only@*/ void *xrealloc(/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ + void *oldmem, size_t size) /*@modifies oldmem@*/; +void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) /*@modifies p@*/; #endif /* Bit-counting: used primarily by HAMT but also in a few other places. */