From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 29 Oct 2014 11:06:42 +0000 (+0000)
Subject: 	* libc/stdio/vfprintf.c (_VFPRINTF_R): Remove unnecessary comparison.
X-Git-Tag: cygwin-1_7_33-release~25
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=28e1bd015974cc3a177343c2d7916fd6748ead0e;p=newlib-cygwin.git

	* libc/stdio/vfprintf.c (_VFPRINTF_R): Remove unnecessary comparison.
---

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 6e542568d..0b134ea99 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-29  Terry Guo  <terry.guo@arm.com>
+
+	* libc/stdio/vfprintf.c (_VFPRINTF_R): Remove unnecessary comparison.
+
+2014-10-27  Corinna Vinschen  <vinschen@redhat.com>
+
+	* libc/stdlib/__call_atexit.c (__deregister_exitproc): Add Cygwin-only
+	function to deregister functions from the atexit function chain.
+
 2014-10-27  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
 	* libc/include/sys/unistd.h (sethostname): Declare if
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index dd9c22a6d..5e6c61ca4 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -1521,11 +1521,9 @@ string:
 				 */
 				char *p = memchr (cp, 0, prec);
 
-				if (p != NULL) {
+				if (p != NULL)
 					size = p - cp;
-					if (size > prec)
-						size = prec;
-				} else
+				else
 					size = prec;
 			} else
 				size = strlen (cp);