diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
| commit | 511eff7bf616a313e6fc2397db718a81e93847cc (patch) | |
| tree | bc8c7d40221e4f0d728e2c5b3eb0a9802b99d95f /libshouldbeinlibc/idvec.h | |
| parent | d4b231dd9f874076c62f35590a9f6b93ca6481d7 (diff) | |
| parent | 69056411a354300a17d1e92027435c988508655d (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'libshouldbeinlibc/idvec.h')
| -rw-r--r-- | libshouldbeinlibc/idvec.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libshouldbeinlibc/idvec.h b/libshouldbeinlibc/idvec.h index 3c70a5d7..abbc273e 100644 --- a/libshouldbeinlibc/idvec.h +++ b/libshouldbeinlibc/idvec.h @@ -24,9 +24,12 @@ #include <hurd/hurd_types.h> #include <errno.h> #include <string.h> +#include <features.h> -#ifndef IDVEC_EI -#define IDVEC_EI extern inline +#ifdef IDVEC_DEFINE_EI +#define IDVEC_EI +#else +#define IDVEC_EI __extern_inline #endif struct idvec @@ -50,6 +53,14 @@ void idvec_free_wrapper (struct idvec *idvec); /* Free IDVEC and any storage associated with it. */ void idvec_free (struct idvec *idvec); +extern void idvec_clear (struct idvec *idvec); + +extern int idvec_is_empty (const struct idvec *idvec); + +extern int idvec_equal (const struct idvec *idvec1, const struct idvec *idvec2); + +#if defined(__USE_EXTERN_INLINES) || defined(IDVEC_DEFINE_EI) + /* Mark IDVEC as not containing any ids. */ IDVEC_EI void idvec_clear (struct idvec *idvec) @@ -74,6 +85,8 @@ idvec_equal (const struct idvec *idvec1, const struct idvec *idvec2) || memcmp (idvec1->ids, idvec2->ids, num * sizeof *idvec1->ids) == 0); } +#endif /* Use extern inlines. */ + /* Ensure that IDVEC has enough spaced allocated to hold NUM ids, thus ensuring that any subsequent ids added won't return a memory allocation error unless it would result in more ids that NUM. ENOMEM is returned if @@ -87,6 +100,10 @@ error_t idvec_grow (struct idvec *idvec, unsigned inc); /* Returns true if IDVEC contains ID, at or after position POS. */ int idvec_tail_contains (const struct idvec *idvec, unsigned pos, uid_t id); +extern int idvec_contains (const struct idvec *idvec, uid_t id); + +#if defined(__USE_EXTERN_INLINES) || defined(IDVEC_DEFINE_EI) + /* Returns true if IDVEC contains ID. */ IDVEC_EI int idvec_contains (const struct idvec *idvec, uid_t id) @@ -94,6 +111,8 @@ idvec_contains (const struct idvec *idvec, uid_t id) return idvec_tail_contains (idvec, 0, id); } +#endif /* Use extern inlines. */ + /* Insert ID into IDVEC at position POS, returning ENOMEM if there wasn't enough memory, or 0. */ error_t idvec_insert (struct idvec *idvec, unsigned pos, uid_t id); |