qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* misc/sys/cdefs.h (__attribute_warn_unused_result__): Define.
	* stdlib/stdlib.h: Make realloc with
	__attribute_warn_unused_result__ instead of __wur.
	* malloc/malloc.h: Add __wur and __attribute_warn_unused_result__
	markers as in <stdlib.h>.
This commit is contained in:
Ulrich Drepper 2005-01-07 19:42:24 +00:00
parent e2070ca2b4
commit 9ee4c01788
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2005-01-07 Ulrich Drepper <drepper@redhat.com> 2005-01-07 Ulrich Drepper <drepper@redhat.com>
* misc/sys/cdefs.h (__attribute_warn_unused_result__): Define.
* stdlib/stdlib.h: Make realloc with
__attribute_warn_unused_result__ instead of __wur.
* malloc/malloc.h: Add __wur and __attribute_warn_unused_result__
markers as in <stdlib.h>.
* libio/stdio.h: Remove __wur from rename and remove. * libio/stdio.h: Remove __wur from rename and remove.
* posix/unistd.h: Remove __wur from dup2. * posix/unistd.h: Remove __wur from dup2.

17
malloc/malloc.h
View File

@ -1,5 +1,5 @@
/* Prototypes and definition for malloc implementation. /* Prototypes and definition for malloc implementation.
Copyright (C) 1996,97,99,2000,2002,2003,2004 Free Software Foundation, Inc. Copyright (C) 1996,97,99,2000,2002-2004,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -117,17 +117,18 @@ extern "C" {
#endif #endif
/* Allocate SIZE bytes of memory. */ /* Allocate SIZE bytes of memory. */
extern __malloc_ptr_t malloc __MALLOC_P ((size_t __size)) __attribute_malloc__; extern __malloc_ptr_t malloc __MALLOC_P ((size_t __size))
__attribute_malloc__ __wur;
/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */ /* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */
extern __malloc_ptr_t calloc __MALLOC_P ((size_t __nmemb, size_t __size)) extern __malloc_ptr_t calloc __MALLOC_P ((size_t __nmemb, size_t __size))
__attribute_malloc__; __attribute_malloc__ __wur;
/* Re-allocate the previously allocated block in __ptr, making the new /* Re-allocate the previously allocated block in __ptr, making the new
block SIZE bytes long. */ block SIZE bytes long. */
extern __malloc_ptr_t realloc __MALLOC_P ((__malloc_ptr_t __ptr, extern __malloc_ptr_t realloc __MALLOC_P ((__malloc_ptr_t __ptr,
size_t __size)) size_t __size))
__attribute_malloc__; __attribute_malloc__ __attribute_warn_unused_result__;
/* Free a block allocated by `malloc', `realloc' or `calloc'. */ /* Free a block allocated by `malloc', `realloc' or `calloc'. */
extern void free __MALLOC_P ((__malloc_ptr_t __ptr)); extern void free __MALLOC_P ((__malloc_ptr_t __ptr));
@ -136,15 +137,17 @@ extern void free __MALLOC_P ((__malloc_ptr_t __ptr));
extern void cfree __MALLOC_P ((__malloc_ptr_t __ptr)); extern void cfree __MALLOC_P ((__malloc_ptr_t __ptr));
/* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ /* Allocate SIZE bytes allocated to ALIGNMENT bytes. */
extern __malloc_ptr_t memalign __MALLOC_P ((size_t __alignment, size_t __size)); extern __malloc_ptr_t memalign __MALLOC_P ((size_t __alignment, size_t __size))
__attribute_malloc__ __wur;
/* Allocate SIZE bytes on a page boundary. */ /* Allocate SIZE bytes on a page boundary. */
extern __malloc_ptr_t valloc __MALLOC_P ((size_t __size)) __attribute_malloc__; extern __malloc_ptr_t valloc __MALLOC_P ((size_t __size))
__attribute_malloc__ __wur;
/* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up /* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up
__size to nearest pagesize. */ __size to nearest pagesize. */
extern __malloc_ptr_t pvalloc __MALLOC_P ((size_t __size)) extern __malloc_ptr_t pvalloc __MALLOC_P ((size_t __size))
__attribute_malloc__; __attribute_malloc__ __wur;
/* Underlying allocation function; successive calls should return /* Underlying allocation function; successive calls should return
contiguous pieces of memory. */ contiguous pieces of memory. */

13
misc/sys/cdefs.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992-2001, 2002, 2004 Free Software Foundation, Inc. /* Copyright (C) 1992-2001, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -257,9 +257,16 @@
/* If fortification mode, we warn about unused results of certain /* If fortification mode, we warn about unused results of certain
function calls which can lead to problems. */ function calls which can lead to problems. */
#if __GNUC_PREREQ (3,4) && __USE_FORTIFY_LEVEL > 0 #if __GNUC_PREREQ (3,4)
# define __wur __attribute__ ((__warn_unused_result__)) # define __attribute_warn_unused_result__ \
__attribute__ ((__warn_unused_result__))
# if __USE_FORTIFY_LEVEL > 0
# define __wur __attribute_warn_unused_result__
# endif
#else #else
# define __attribute_warn_unused_result__ /* empty */
#endif
#ifndef __wur
# define __wur /* Ignore */ # define __wur /* Ignore */
#endif #endif

2
stdlib/stdlib.h
View File

@ -596,7 +596,7 @@ __BEGIN_NAMESPACE_STD
/* Re-allocate the previously allocated block /* Re-allocate the previously allocated block
in PTR, making the new block SIZE bytes long. */ in PTR, making the new block SIZE bytes long. */
extern void *realloc (void *__ptr, size_t __size) extern void *realloc (void *__ptr, size_t __size)
__THROW __attribute_malloc__ __wur; __THROW __attribute_malloc__ __attribute_warn_unused_result__;
/* Free a block allocated by `malloc', `realloc' or `calloc'. */ /* Free a block allocated by `malloc', `realloc' or `calloc'. */
extern void free (void *__ptr) __THROW; extern void free (void *__ptr) __THROW;
__END_NAMESPACE_STD __END_NAMESPACE_STD