From patchwork Sat Jun 21 16:29:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 362458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 61A1B140084 for ; Sun, 22 Jun 2014 02:30:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752781AbaFUQaW (ORCPT ); Sat, 21 Jun 2014 12:30:22 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:54781 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752541AbaFUQaQ (ORCPT ); Sat, 21 Jun 2014 12:30:16 -0400 Received: by mail-we0-f182.google.com with SMTP id q59so5050784wes.13 for ; Sat, 21 Jun 2014 09:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nh33foBugJK+ta9xdIpPcCwTf1voWO7lpK1agpo3Bdc=; b=AbSvBaPwscDvnNOpLKR9Xb3KaRufNSWCMxeXrACL9tiIfZfzxfD1+Nmz56pmYHvbXp XFnTMyopmepjKEc4QAOzgMHCVo/oSBmOA4juArdWH8Ippt0AVihBgfiqcQmsieSKwTac +TmJIPzsFxrW4rA/ETo4LGMFpDyqCyqHsssG1DvfN4FZakKZ7b0PIAUo7xSs+YNNeoog pLMBUt5WdMCm+9xwG6Buq6Jq0vclMARXogO63z/mAfz49UIISfSe9UjQvWlKKaxsbBwt 7lFBNuunYRnzV9/DSwhK43/FAbD6bIhvGuoIb/nmZurcWp+uPwHGRAPF8CvNqYrXtuM+ Xp1Q== X-Received: by 10.180.189.79 with SMTP id gg15mr12347365wic.0.1403368215178; Sat, 21 Jun 2014 09:30:15 -0700 (PDT) Received: from localhost.localdomain ([188.84.98.232]) by mx.google.com with ESMTPSA id hs8sm15386293wib.10.2014.06.21.09.30.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 Jun 2014 09:30:14 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 3/4] expr: meta: Delete the last comma character in json text. Date: Sat, 21 Jun 2014 18:29:59 +0200 Message-Id: <1403368200-8860-4-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403368200-8860-1-git-send-email-anarey@gmail.com> References: <1403368200-8860-1-git-send-email-anarey@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Code refactoring to delete correctly the last comma character in json text. Signed-off-by: Ana Rey --- src/expr/meta.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/expr/meta.c b/src/expr/meta.c index 25026a9..95d538c 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -322,9 +322,10 @@ nft_rule_expr_meta_snprintf_json(char *buf, size_t size, } /* Remove the last separator characther */ - buf[offset-1] = '\0'; + if (offset > 0) + offset--; - return offset-1; + return offset; } static int