about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-04-05 10:44:08 +0200
committerAndreas Jaeger <aj@suse.de>2012-04-05 10:44:08 +0200
commit349fa79f5527f78d60c78eb1fbb2dfb56846018c (patch)
tree797be30e83cc4da7eeeb3abbeb387df58831264b
parent6745ccf5a4b03a6565e7cc5b7e00e00a56cd440b (diff)
downloadglibc-349fa79f5527f78d60c78eb1fbb2dfb56846018c.tar.gz
glibc-349fa79f5527f78d60c78eb1fbb2dfb56846018c.tar.xz
glibc-349fa79f5527f78d60c78eb1fbb2dfb56846018c.zip
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
-rw-r--r--ChangeLog6
-rw-r--r--NEWS4
-rw-r--r--stdlib/stdlib.h5
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b7c05b686a..946c714a22 100644
--- 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 776867b492..2f0e764894 100644
--- 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 d3bd49275c..4da4678f87 100644
--- 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 \