From facd2482db60c9e08f60ecd6f004940393e1630a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 6 Jun 2009 22:39:23 +0200 Subject: [PATCH] hash: declare some functions with the warn_unused_result attribute * lib/hash.h (__attribute__, ATTRIBUTE_WUR): Define. --- ChangeLog | 5 +++++ lib/hash.h | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b47d66dc5d..a198937669 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-07 Jim Meyering + + hash: declare some functions with the warn_unused_result attribute + * lib/hash.h (__attribute__, ATTRIBUTE_WUR): Define. + 2009-06-07 Bruno Haible * tests/test-alignof.c: Don't test int64_t if it does not exist. diff --git a/lib/hash.h b/lib/hash.h index fc1af28a97..2834bd2c0b 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -1,5 +1,5 @@ /* hash - hashing table processing. - Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2003, 2009 Free Software Foundation, Inc. Written by Jim Meyering , 1998. This program is free software: you can redistribute it and/or modify @@ -26,6 +26,17 @@ # include # include +/* The warn_unused_result attribute appeared first in gcc-3.4.0 */ +# ifndef __attribute__ +# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) +# define __attribute__(x) +# endif +# endif + +# ifndef ATTRIBUTE_WUR +# define ATTRIBUTE_WUR __attribute__ ((__warn_unused_result__)) +# endif + typedef size_t (*Hash_hasher) (const void *, size_t); typedef bool (*Hash_comparator) (const void *, const void *); typedef void (*Hash_data_freer) (void *); @@ -75,13 +86,13 @@ size_t hash_string (const char *, size_t); void hash_reset_tuning (Hash_tuning *); Hash_table *hash_initialize (size_t, const Hash_tuning *, Hash_hasher, Hash_comparator, - Hash_data_freer); + Hash_data_freer) ATTRIBUTE_WUR; void hash_clear (Hash_table *); void hash_free (Hash_table *); /* Insertion and deletion. */ -bool hash_rehash (Hash_table *, size_t); -void *hash_insert (Hash_table *, const void *); +bool hash_rehash (Hash_table *, size_t) ATTRIBUTE_WUR; +void *hash_insert (Hash_table *, const void *) ATTRIBUTE_WUR; void *hash_delete (Hash_table *, const void *); #endif -- 2.30.2