From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932841AbbIYRla (ORCPT ); Fri, 25 Sep 2015 13:41:30 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:35947 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932819AbbIYRl1 (ORCPT ); Fri, 25 Sep 2015 13:41:27 -0400 From: Rasmus Villemoes To: Andrew Morton Cc: Tejun Heo , Andy Shevchenko , linux-kernel@vger.kernel.org, Kees Cook , Rasmus Villemoes Subject: [PATCH 3/4] lib/vsprintf.c: Remove SPECIAL handling in pointer() Date: Fri, 25 Sep 2015 19:41:04 +0200 Message-Id: <1443202865-25533-4-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1443202865-25533-1-git-send-email-linux@rasmusvillemoes.dk> References: <1443202865-25533-1-git-send-email-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As a quick git grep -E '%[ +0#-]*#[ +0#-]*(\*|[0-9]+)?(\.(\*|[0-9]+)?)?p' shows, nobody uses the # flag with %p. Moreover, I think users are unlikely to show up since gcc will complain with warning: `#' flag used with ‘%p’ gnu_printf format [-Wformat] Since default_width is effectively always 2*sizeof(void*), we can simplify the prologue of pointer() and save a few instructions. Signed-off-by: Rasmus Villemoes --- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 03fa10b4be96..98b0d7be3fb7 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1457,7 +1457,7 @@ static noinline_for_stack char *pointer(const char *fmt, char *buf, char *end, void *ptr, struct printf_spec spec) { - int default_width = 2 * sizeof(void *) + (spec.flags & SPECIAL ? 2 : 0); + const int default_width = 2 * sizeof(void *); if (!ptr && *fmt != 'K') { /* -- 2.1.3