From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756155AbbCFPSX (ORCPT ); Fri, 6 Mar 2015 10:18:23 -0500 Received: from mga14.intel.com ([192.55.52.115]:53006 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755020AbbCFPSU (ORCPT ); Fri, 6 Mar 2015 10:18:20 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,353,1422950400"; d="scan'208";a="463490146" From: Andy Shevchenko To: Rasmus Villemoes , Andrew Morton , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v2 1/1] sunrpc/cache: simplify qword_add Date: Fri, 6 Mar 2015 17:18:17 +0200 Message-Id: <1425655097-12845-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit 7572d3b29896 (lib/string_helpers.c: change semantics of string_escape_mem) updates qword_add() to follow the changes in lib/string_helpers.c. This patch simplifies the approach. Signed-off-by: Andy Shevchenko --- Andrew, I think this one can be folded in the mentioned commit by Rasmus. Changelog v2: - add missed curly braces (grr... I have them in initial comment) net/sunrpc/cache.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 22c4418..ba815df 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -1068,16 +1068,16 @@ void qword_add(char **bpp, int *lp, char *str) { char *bp = *bpp; int len = *lp; - int ret, written; + int ret; if (len < 0) return; ret = string_escape_str(str, bp, len, ESCAPE_OCTAL, "\\ \n\t"); - written = min(ret, len); - bp += written; - if (ret >= len) + if (ret >= len) { + bp += len; len = -1; - else { + } else { + bp += ret; len -= ret; *bp++ = ' '; len--; -- 2.1.4