From patchwork Thu Dec 19 21:58:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1213736 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="s+7tCinV"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47f5TW3B5jz9sPL for ; Fri, 20 Dec 2019 09:02:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rzl5WYVSyfUlLjZQCQzpAOmYWLGdsE9qAxqTo1CLGqA=; b=s+7tCinVkePkYs Nmld4BhK3xbQLbgXFX7nVXd92MRLT/HV45oCSobLsSG63SFNiPIkinCX1xljccbgXbN6IrgBVvRmL dIugoXr2bwfRKsoVo9VzRh3pdjQHbRikuLOqjWjrrpjphS+u2woE5cEABle1KCoav1E32utqbcsSW /iYDxoK4w8MFI68xx6QW9RRxHSzIavFojfeMoZNZ/AyI6GQqHjsmX4yV/b27jo6SkQ8DjTeA+JxF9 ewyDZOm4TZ0MmFgj4ZQvZEJiy72EJyDJUurFmzANWUfCGEIDhbXCC3qksPVhZlGyGLHOIXxhbJTSU 07I5oBm/lu6/rKOLGhJA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ii3sN-0008RZ-KV; Thu, 19 Dec 2019 22:02:31 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ii3ou-0000xo-Dt for openwrt-devel@lists.openwrt.org; Thu, 19 Dec 2019 21:59:02 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 65DD04B5A; Thu, 19 Dec 2019 22:58:53 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id c825c6e7; Thu, 19 Dec 2019 22:58:40 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Thu, 19 Dec 2019 22:58:36 +0100 Message-Id: <20191219215836.21773-21-ynezz@true.cz> In-Reply-To: <20191219215836.21773-1-ynezz@true.cz> References: <20191219215836.21773-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191219_135856_646058_EE6B7FC0 X-CRM114-Status: UNSURE ( 8.03 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH libubox 20/20] blobmsg: reuse blobmsg_namelen in blobmsg_data X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Move blobmsg_namelen into header file so it's possible to reuse it in blobmsg_data. Signed-off-by: Petr Štetiar --- blobmsg.c | 6 ------ blobmsg.h | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/blobmsg.c b/blobmsg.c index 7cd0934600de..48dba8156d58 100644 --- a/blobmsg.c +++ b/blobmsg.c @@ -25,12 +25,6 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = { [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY, }; -static uint16_t -blobmsg_namelen(const struct blobmsg_hdr *hdr) -{ - return be16_to_cpu(hdr->namelen); -} - bool blobmsg_check_attr(const struct blob_attr *attr, bool name) { return blobmsg_check_attr_len(attr, name, blob_raw_len(attr)); diff --git a/blobmsg.h b/blobmsg.h index af88c1feb86f..be3c7ee2cbfd 100644 --- a/blobmsg.h +++ b/blobmsg.h @@ -69,6 +69,11 @@ static inline int blobmsg_type(const struct blob_attr *attr) return blob_id(attr); } +static uint16_t blobmsg_namelen(const struct blobmsg_hdr *hdr) +{ + return be16_to_cpu(hdr->namelen); +} + static inline void *blobmsg_data(const struct blob_attr *attr) { struct blobmsg_hdr *hdr; @@ -81,7 +86,7 @@ static inline void *blobmsg_data(const struct blob_attr *attr) data = (char *) blob_data(attr); if (blob_is_extended(attr)) - data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen)); + data += blobmsg_hdrlen(blobmsg_namelen(hdr)); return data; }