Don't warn about unused result of mktemp

    [BZ #13908]
    mktemp always returns TEMPLATE, the caller should check TEMPLATE[0]
    instead of TEMPLATE, so do not warn about the unused result.
    Fix also the comment for mktemp

diff --git a/ChangeLog b/ChangeLog
index b7c05b686aadcd2578d5fe45e555fa87a3f65380..946c714a22d1fc7488d59d0c164cbbd1084e0d9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-05  Andreas Jaeger  <aj@suse.de>
+
+       [BZ #13908]
+       * stdlib/stdlib.h: Don't warn about unused result of mktemp, fix
+       comment.
+
 2012-04-05  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
 
        * sysdeps/sh/sh4/fpu/fesetround.c (fesetround): Fix return value

diff --git a/NEWS b/NEWS
index 776867b49234243cdb82bff02f77dc3a92957b67..2f0e76489410ad7f807a6b91b8f59991b4907741 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,8 +18,8 @@ Version 2.16
   13566, 13583, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704,
   13706, 13726, 13738, 13760, 13761, 13786, 13792, 13806, 13824, 13840,
   13841, 13844, 13846, 13851, 13852, 13854, 13871, 13879, 13883, 13892,
-  13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920,
-  13921, 13926, 13928, 13938
+  13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919,
+  13920, 13921, 13926, 13928, 13938
 
 * ISO C11 support:
 

diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index d3bd49275cf88e883deaefd47597327d48b19cd7..4da4678f87bdc33b91a47c623895d13d4d7e8dad 100644 (file)
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -603,8 +603,9 @@ extern int clearenv (void) __THROW;
 /* Generate a unique temporary file name from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the file name unique.
-   Returns TEMPLATE, or a null pointer if it cannot get a unique file name.  */
-extern char *mktemp (char *__template) __THROW __nonnull ((1)) __wur;
+   Always returns TEMPLATE, it's either a temporary file name or a null
+   string if it cannot get a unique file name.  */
+extern char *mktemp (char *__template) __THROW __nonnull ((1));
 #endif
 
 #if defined __USE_MISC || defined __USE_XOPEN_EXTENDED \