From owner-svn-src-all@FreeBSD.ORG  Fri Feb  3 21:38:23 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFC61106566C;
	Fri,  3 Feb 2012 21:38:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F7278FC0A;
	Fri,  3 Feb 2012 21:38:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q13LcN4E005287;
	Fri, 3 Feb 2012 21:38:23 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q13LcN7R005285;
	Fri, 3 Feb 2012 21:38:23 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201202032138.q13LcN7R005285@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 3 Feb 2012 21:38:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230961 - stable/9/usr.bin/printf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Feb 2012 21:38:23 -0000

Author: pfg
Date: Fri Feb  3 21:38:23 2012
New Revision: 230961
URL: http://svn.freebsd.org/changeset/base/230961

Log:
  MFC:	r230027
  
  Style cleanups for printf.
  
  PR:		bin/152934
  Approved by:	jhb (mentor)
  Obtained from:	Illumos

Modified:
  stable/9/usr.bin/printf/printf.c
Directory Properties:
  stable/9/usr.bin/printf/   (props changed)

Modified: stable/9/usr.bin/printf/printf.c
==============================================================================
--- stable/9/usr.bin/printf/printf.c	Fri Feb  3 21:30:31 2012	(r230960)
+++ stable/9/usr.bin/printf/printf.c	Fri Feb  3 21:38:23 2012	(r230961)
@@ -66,21 +66,21 @@ static const char rcsid[] =
 #include "error.h"
 #endif
 
-#define PF(f, func) do { \
-	char *b = NULL; \
-	if (havewidth) \
-		if (haveprec) \
+#define PF(f, func) do {						\
+	char *b = NULL;							\
+	if (havewidth)							\
+		if (haveprec)						\
 			(void)asprintf(&b, f, fieldwidth, precision, func); \
-		else \
-			(void)asprintf(&b, f, fieldwidth, func); \
-	else if (haveprec) \
-		(void)asprintf(&b, f, precision, func); \
-	else \
-		(void)asprintf(&b, f, func); \
-	if (b) { \
-		(void)fputs(b, stdout); \
-		free(b); \
-	} \
+		else							\
+			(void)asprintf(&b, f, fieldwidth, func);	\
+	else if (haveprec)						\
+		(void)asprintf(&b, f, precision, func);			\
+	else								\
+		(void)asprintf(&b, f, func);				\
+	if (b) {							\
+		(void)fputs(b, stdout);					\
+		free(b);						\
+	}								\
 } while (0)
 
 static int	 asciicode(void);
@@ -357,10 +357,10 @@ mknum(char *str, char ch)
 static int
 escape(char *fmt, int percent, size_t *len)
 {
-	char *save, *store;
-	int value, c;
+	char *save, *store, c;
+	int value;
 
-	for (save = store = fmt; (c = *fmt); ++fmt, ++store) {
+	for (save = store = fmt; ((c = *fmt) != 0); ++fmt, ++store) {
 		if (c != '\\') {
 			*store = c;
 			continue;
@@ -414,7 +414,7 @@ escape(char *fmt, int percent, size_t *l
 				*store++ = '%';
 				*store = '%';
 			} else
-				*store = value;
+				*store = (char)value;
 			break;
 		default:
 			*store = *fmt;