From owner-svn-src-head@FreeBSD.ORG  Mon Oct 11 08:10:12 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B6011065673;
	Mon, 11 Oct 2010 08:10:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A4438FC1C;
	Mon, 11 Oct 2010 08:10:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9B8ACbA006876;
	Mon, 11 Oct 2010 08:10:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9B8AC5O006874;
	Mon, 11 Oct 2010 08:10:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201010110810.o9B8AC5O006874@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 11 Oct 2010 08:10:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213681 - head/contrib/llvm/tools/clang/lib/Analysis
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Oct 2010 08:10:12 -0000

Author: rpaulo
Date: Mon Oct 11 08:10:12 2010
New Revision: 213681
URL: http://svn.freebsd.org/changeset/base/213681

Log:
  Restore the support for the 'r' and the 'y' conversion specifiers, first
  added on r208987.
  These are undocumented but are part of printf(9).

Modified:
  head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp

Modified: head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp	Mon Oct 11 01:05:42 2010	(r213680)
+++ head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp	Mon Oct 11 08:10:12 2010	(r213681)
@@ -195,6 +195,8 @@ static PrintfSpecifierResult ParsePrintf
     case 'm': k = ConversionSpecifier::PrintErrno; break;
     // FreeBSD format extensions
     case 'b': if (FormatExtensions) k = ConversionSpecifier::bArg; break; /* check for int and then char * */
+    case 'r': if (FormatExtensions) k = ConversionSpecifier::xArg; break;
+    case 'y': if (FormatExtensions) k = ConversionSpecifier::iArg; break;
     case 'D': if (FormatExtensions) k = ConversionSpecifier::DArg; break; /* check for u_char * pointer and a char * string */
   }
   PrintfConversionSpecifier CS(conversionPosition, k);