diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-10-15 20:20:05 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2014-10-15 20:20:05 +0000 |
| commit | 273a9f0fd107ee06c8f9f516ad6412f62872f37f (patch) | |
| tree | 0b95c0fc810d46f2993b7222ec997e2cc685e750 /libiberty | |
| parent | 4c686cc9c5f6d867e7307697865b7fa5a01a86dc (diff) | |
libiberty: Expose choose_tmpdir, and fix constness of return type
include/ChangeLog:
* libiberty.h (choose_tmpdir): New prototype.
libiberty/ChangeLog:
* choose-temp.c (choose_tmpdir): Remove now-redundant local
copy of prototype.
* functions.texi: Regenerate.
* make-temp-file.c (choose_tmpdir): Convert return type from
char * to const char * - given that this returns a pointer to
a memoized allocation, the caller must not touch it.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@216285 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 9 | ||||
| -rw-r--r-- | libiberty/choose-temp.c | 1 | ||||
| -rw-r--r-- | libiberty/functions.texi | 13 | ||||
| -rw-r--r-- | libiberty/make-temp-file.c | 4 |
4 files changed, 17 insertions, 10 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 5211664c242..73dee14ad67 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,12 @@ +2014-10-15 David Malcolm <dmalcolm@redhat.com> + + * choose-temp.c (choose_tmpdir): Remove now-redundant local + copy of prototype. + * functions.texi: Regenerate. + * make-temp-file.c (choose_tmpdir): Convert return type from + char * to const char * - given that this returns a pointer to + a memoized allocation, the caller must not touch it. + 2014-10-14 Joel Brobecker <brobecker@adacore.com> * d-demangle.c: Replace strtold with strtod in global comment. diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c index 0a454cfa7ca..8e1e84be765 100644 --- a/libiberty/choose-temp.c +++ b/libiberty/choose-temp.c @@ -34,7 +34,6 @@ Boston, MA 02110-1301, USA. */ #endif #include "libiberty.h" -extern char *choose_tmpdir (void); /* Name of temporary file. mktemp requires 6 trailing X's. */ diff --git a/libiberty/functions.texi b/libiberty/functions.texi index 9323ff9f2e4..387aee0bb9c 100644 --- a/libiberty/functions.texi +++ b/libiberty/functions.texi @@ -125,7 +125,7 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of @end deftypefn -@c choose-temp.c:46 +@c choose-temp.c:45 @deftypefn Extension char* choose_temp_base (void) Return a prefix for temporary file names or @code{NULL} if unable to @@ -139,7 +139,7 @@ not recommended. @end deftypefn @c make-temp-file.c:96 -@deftypefn Replacement char* choose_tmpdir () +@deftypefn Replacement const char* choose_tmpdir () Returns a pointer to a directory path suitable for creating temporary files in. @@ -160,9 +160,8 @@ number of seconds used. @dots{}, @code{NULL}) Concatenate zero or more of strings and return the result in freshly -@code{xmalloc}ed memory. Returns @code{NULL} if insufficient memory is -available. The argument list is terminated by the first @code{NULL} -pointer encountered. Pointers to empty strings are ignored. +@code{xmalloc}ed memory. The argument list is terminated by the first +@code{NULL} pointer encountered. Pointers to empty strings are ignored. @end deftypefn @@ -528,7 +527,7 @@ nineteen EBCDIC varying characters is tested; exercise caution.) @end ftable @end defvr -@c hashtab.c:336 +@c hashtab.c:328 @deftypefn Supplemental htab_t htab_create_typed_alloc (size_t @var{size}, @ htab_hash @var{hash_f}, htab_eq @var{eq_f}, htab_del @var{del_f}, @ htab_alloc @var{alloc_tab_f}, htab_alloc @var{alloc_f}, @ @@ -1163,7 +1162,7 @@ control over the state of the random number generator. @end deftypefn -@c concat.c:174 +@c concat.c:160 @deftypefn Extension char* reconcat (char *@var{optr}, const char *@var{s1}, @ @dots{}, @code{NULL}) diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c index 7b74f8179b1..244cc23c509 100644 --- a/libiberty/make-temp-file.c +++ b/libiberty/make-temp-file.c @@ -93,7 +93,7 @@ static char *memoized_tmpdir; /* -@deftypefn Replacement char* choose_tmpdir () +@deftypefn Replacement const char* choose_tmpdir () Returns a pointer to a directory path suitable for creating temporary files in. @@ -102,7 +102,7 @@ files in. */ -char * +const char * choose_tmpdir (void) { if (!memoized_tmpdir) |