From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755119AbbKWVdD (ORCPT ); Mon, 23 Nov 2015 16:33:03 -0500 Received: from mail-lf0-f53.google.com ([209.85.215.53]:34145 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755370AbbKWV3x (ORCPT ); Mon, 23 Nov 2015 16:29:53 -0500 From: Rasmus Villemoes To: Andrew Morton Cc: Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH 07/14] lib/vsprintf.c: slightly refactor vscnprintf() Date: Mon, 23 Nov 2015 22:29:24 +0100 Message-Id: <1448314171-25856-8-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1448314171-25856-1-git-send-email-linux@rasmusvillemoes.dk> References: <1448314171-25856-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we're given a size of 0, the vsnprintf() won't have any side effects, and neither "i < size" or "size != 0" will trigger. So we might as well return 0 immediately. Signed-off-by: Rasmus Villemoes --- lib/vsprintf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8af5535fd738..e22a6189548f 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2036,13 +2036,14 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) { int i; + if (unlikely(!size)) + return 0; + i = vsnprintf(buf, size, fmt, args); if (likely(i < size)) return i; - if (size != 0) - return size - 1; - return 0; + return size - 1; } EXPORT_SYMBOL(vscnprintf); -- 2.6.1