Message ID | 20211130105600.3103609-31-jeremy@azazel.net |
---|---|
State | Accepted |
Delegated to: | Pablo Neira |
Headers | show
Return-Path: <netfilter-devel-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=HAt2oqq+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=<UNKNOWN>) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4J3KQ1732Fz9sRR for <incoming@patchwork.ozlabs.org>; Tue, 30 Nov 2021 22:15:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237758AbhK3LSj (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Tue, 30 Nov 2021 06:18:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237792AbhK3LSj (ORCPT <rfc822;netfilter-devel@vger.kernel.org>); Tue, 30 Nov 2021 06:18:39 -0500 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1CA9C061746 for <netfilter-devel@vger.kernel.org>; Tue, 30 Nov 2021 03:15:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QAaVH8Bv6AvhYDfKHiw3jNqfN3emI88hEll8l1Laocc=; b=HAt2oqq+NFgDeU4P2TFSPahgQ2 kgsx/vZkaN0NbTZaCxlkJJy/KVUA1E2aEThB4dFdkwtwQDw18CI5fMn8OseO3df7+K5/zoZoHDQIm oAUYiNisp4ED0PkCaho+jVQptewGn+28/vDNohCu7huttamHmQHFpQfMYHoxbMtYfPE2ZjSTvcJ/V Mj1qiHlvqnq1rF852JeaOv9R9K3p1X8EFwRoIlZYs9P9QBWxdCDSbaRsQ0Yi2UuJK224wVdtMgTsU hB4Vs710uW814Rwm/rPk66NgyKPq7dIBNOk7cjP27kcw3QAO3tQ+KegtdxVLcgPnM4SE+KAs9mb81 ZogQDeWA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from <jeremy@azazel.net>) id 1ms0nt-00Awwr-Px for netfilter-devel@vger.kernel.org; Tue, 30 Nov 2021 10:56:05 +0000 From: Jeremy Sowden <jeremy@azazel.net> To: Netfilter Devel <netfilter-devel@vger.kernel.org> Subject: [ulogd2 PATCH v4 30/32] output: JSON: optimize appending of newline to output Date: Tue, 30 Nov 2021 10:55:58 +0000 Message-Id: <20211130105600.3103609-31-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211130105600.3103609-1-jeremy@azazel.net> References: <20211130105600.3103609-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: <netfilter-devel.vger.kernel.org> X-Mailing-List: netfilter-devel@vger.kernel.org |
Series |
Fixes for compiler warnings
|
expand
|
diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c index 6af872c64391..f60bd6ea51da 100644 --- a/output/ulogd_output_JSON.c +++ b/output/ulogd_output_JSON.c @@ -404,8 +404,8 @@ static int json_interp(struct ulogd_pluginstance *upi) return ULOGD_IRET_ERR; } buf = tmp; - strncat(buf, "\n", 1); - buflen++; + buf[buflen++] = '\n'; + buf[buflen] = '\0'; if (opi->mode == JSON_MODE_FILE) return json_interp_file(upi, buf);
We have `buflen` available. We can remove `strncat` and assign the characters directly, without traversing the whole buffer. Fixes a compiler warning: logd_output_JSON.c:407:9: warning: `strncat` specified bound 1 equals source length Signed-off-by: Jeremy Sowden <jeremy@azazel.net> --- output/ulogd_output_JSON.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)