From c2b08ae26cdc70a3acf7d1bc15bc77c92bbcc97c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 30 Sep 2013 10:19:38 -0700 Subject: [PATCH] fpending, obstack, strerror-override: use pure+const function attrs * lib/fpending.h (__fpending): Declare with the "pure" attribute. * lib/obstack.c (_obstack_allocated_p): Likewise. * lib/obstack.h (_obstack_memory_used): Likewise. (_obstack_memory_used): Likewise. * lib/strerror-override.h (strerror_override): Declare with the "const" attribute. --- ChangeLog | 10 ++++++++++ lib/fpending.h | 2 +- lib/obstack.c | 2 +- lib/obstack.h | 2 +- lib/strerror-override.h | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 902b12900..61a2cb3cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2013-09-30 Jim Meyering + + fpending, obstack, strerror-override: use pure+const function attrs + * lib/fpending.h (__fpending): Declare with the "pure" attribute. + * lib/obstack.c (_obstack_allocated_p): Likewise. + * lib/obstack.h (_obstack_memory_used): Likewise. + (_obstack_memory_used): Likewise. + * lib/strerror-override.h (strerror_override): Declare with + the "const" attribute. + 2013-10-18 Eric Blake extern-inline: make safe for -Wundef usage diff --git a/lib/fpending.h b/lib/fpending.h index 4eca3f18e..30d67fcd7 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -25,5 +25,5 @@ #endif #ifndef __fpending -size_t __fpending (FILE *); +size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE; #endif diff --git a/lib/obstack.c b/lib/obstack.c index d915449de..f830fdca3 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -313,7 +313,7 @@ libc_hidden_def (_obstack_newchunk) /* Suppress -Wmissing-prototypes warning. We don't want to declare this in obstack.h because it is just for debugging. */ -int _obstack_allocated_p (struct obstack *h, void *obj); +int _obstack_allocated_p (struct obstack *h, void *obj) _GL_ATTRIBUTE_PURE; int _obstack_allocated_p (struct obstack *h, void *obj) diff --git a/lib/obstack.h b/lib/obstack.h index 7cf98edbd..da45427f8 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -183,7 +183,7 @@ extern int _obstack_begin (struct obstack *, int, int, extern int _obstack_begin_1 (struct obstack *, int, int, void *(*) (void *, long), void (*) (void *, void *), void *); -extern int _obstack_memory_used (struct obstack *); +extern int _obstack_memory_used (struct obstack *) _GL_ATTRIBUTE_PURE; /* The default name of the function for freeing a chunk is 'obstack_free', but gnulib users can override this by defining '__obstack_free'. */ diff --git a/lib/strerror-override.h b/lib/strerror-override.h index 3b8f24b99..0d086b873 100644 --- a/lib/strerror-override.h +++ b/lib/strerror-override.h @@ -48,7 +48,7 @@ || GNULIB_defined_EOWNERDEAD \ || GNULIB_defined_ENOTRECOVERABLE \ || GNULIB_defined_EILSEQ -extern const char *strerror_override (int errnum); +extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST; # else # define strerror_override(ignored) NULL # endif -- 2.11.0