X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fchoose-temp.c;h=8e1e84be7651d05962810979c34696733b338fb3;hb=51d543ed936c9ea7d045ecf80030e6bc8ffff29f;hp=c6df304b5528bc239fe83a9a0c1738c0d50a2e2b;hpb=1dffcc66386145e0eda2bb842a9bccb7eca33981;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index c6df304b55..8e1e84be76 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -14,14 +14,18 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <stdio.h>	/* May get P_tmpdir.  */
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -30,35 +34,41 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #include "libiberty.h"
-extern char *choose_tmpdir PARAMS ((void));
 
 /* Name of temporary file.
    mktemp requires 6 trailing X's.  */
 #define TEMP_FILE "ccXXXXXX"
 #define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
 
-/* Return a prefix for temporary file names or NULL if unable to find one.
-   The current directory is chosen if all else fails so the program is
-   exited if a temporary directory can't be found (mktemp fails).
-   The buffer for the result is obtained with xmalloc. 
+/*
+
+@deftypefn Extension char* choose_temp_base (void)
+
+Return a prefix for temporary file names or @code{NULL} if unable to
+find one.  The current directory is chosen if all else fails so the
+program is exited if a temporary directory can't be found (@code{mktemp}
+fails).  The buffer for the result is obtained with @code{xmalloc}.
+
+This function is provided for backwards compatibility only.  Its use is
+not recommended.
+
+@end deftypefn
 
-   This function is provided for backwards compatability only.  It use
-   is not recommended.  */
+*/
 
 char *
-choose_temp_base ()
+choose_temp_base (void)
 {
   const char *base = choose_tmpdir ();
   char *temp_filename;
   int len;
 
   len = strlen (base);
-  temp_filename = xmalloc (len + TEMP_FILE_LEN + 1);
+  temp_filename = XNEWVEC (char, len + TEMP_FILE_LEN + 1);
   strcpy (temp_filename, base);
   strcpy (temp_filename + len, TEMP_FILE);
 
-  mktemp (temp_filename);
-  if (strlen (temp_filename) == 0)
+  if (mktemp (temp_filename) == 0)
     abort ();
   return temp_filename;
 }