diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-12-11 01:15:28 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-12-11 01:15:28 +0100 |
| commit | 6948250861edce048d7bb3c6b47d13fa3649905e (patch) | |
| tree | c3d1c4a2e42938d93a07095345cb18567fa44710 /lib/argv-iter.h | |
| parent | 441aa3044f43e5572f58c354f01e6bc070acd5c7 (diff) | |
| download | gnulib-6948250861edce048d7bb3c6b47d13fa3649905e.tar.gz | |
New module 'arg-nonnull'. Declare which arguments expect non-NULL values.
Diffstat (limited to 'lib/argv-iter.h')
| -rw-r--r-- | lib/argv-iter.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/lib/argv-iter.h b/lib/argv-iter.h index 537fb1ea29..60c1978c15 100644 --- a/lib/argv-iter.h +++ b/lib/argv-iter.h @@ -17,16 +17,12 @@ #include <stdio.h> #include <stdbool.h> +/* Definition of _GL_ARG_NONNULL. */ +#include "arg-nonnull.h" + struct argv_iterator; enum argv_iter_err; -#undef _ATTRIBUTE_NONNULL_ -#if __GNUC__ == 3 && __GNUC_MINOR__ >= 3 || 3 < __GNUC__ -# define _ATTRIBUTE_NONNULL_(m) __attribute__ ((__nonnull__ (m))) -#else -# define _ATTRIBUTE_NONNULL_(m) -#endif - enum argv_iter_err { AI_ERR_OK = 1, @@ -36,12 +32,12 @@ enum argv_iter_err }; struct argv_iterator *argv_iter_init_argv (char **argv) - _ATTRIBUTE_NONNULL_ (1); + _GL_ARG_NONNULL ((1)); struct argv_iterator *argv_iter_init_stream (FILE *fp) - _ATTRIBUTE_NONNULL_ (1); + _GL_ARG_NONNULL ((1)); char *argv_iter (struct argv_iterator *, enum argv_iter_err *) - _ATTRIBUTE_NONNULL_ (1) _ATTRIBUTE_NONNULL_ (2); + _GL_ARG_NONNULL ((1, 2)); size_t argv_iter_n_args (struct argv_iterator const *) - _ATTRIBUTE_NONNULL_ (1); + _GL_ARG_NONNULL ((1)); void argv_iter_free (struct argv_iterator *) - _ATTRIBUTE_NONNULL_ (1); + _GL_ARG_NONNULL ((1)); |