From patchwork Sat Jul 25 08:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1336199 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=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=CXRcphAx; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IV6dqR+9; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4BDJsr1bGrz9sRR for ; Sat, 25 Jul 2020 18:20:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=OKy/oZPzqWlKYj4aWF6myR1Hk4aFOU97cg+yRK7hgGo=; b=CXRcphAxOFNEcSZMJ7f4O/DCoP YgAejJYKP6FXx34Ky6NygmmnEmcIVXz21sN4BK+hSDBfiAY/DFGTfiM41jrG07ns4z0KmlgOIE4XV n5IXxWPYpFXFsiMqGNZaAmRuLvr3L8IoqNmldiunuQwFmzPKT77rpm32z7U/kGpQeZiLdn2r2URG3 VD78wRrUrpLBoJbNZ3ptOUFtQMUvh1Kisfjn0AR85SaICGda+mMT03tBx7Pz4ky/U89kj19bg+N04 00ODrnfTCwC/MI+SkEWNMqCkP/Ga8DW9Z/uvPzzHRN4ZTeZ4+9XI4zlx+5Fg7d8FuVNTqwLpHw0u1 Lq7Q6eHw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jzFOl-0000SM-Hg; Sat, 25 Jul 2020 08:19:15 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jzFOi-0000Ri-RE for openwrt-devel@lists.openwrt.org; Sat, 25 Jul 2020 08:19:13 +0000 Received: by mail-lj1-x243.google.com with SMTP id h19so12216767ljg.13 for ; Sat, 25 Jul 2020 01:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SkTWxM2+KaU8xEUHCLJyIpONi7dBfIZEkICsMB0nbkY=; b=IV6dqR+9hYc61uwBJu0Ej/EswG9AZo5bF07Qmva33UGm6MNddWNwz3BDGeRFrW7peb JPmKCa01sy0PtnALA1fvR/Uqa9rlPujGhmnakz+8Bj7Dj0XrEj06TOitDMBVxm39nEqY x5uTkwJMSVnYhtZLL23b9/+yn0xu3BrXB9rrrnoF+fYd0V+Qi9TR8YGClLinALpIVlZO 1FiLUZjhVq9A7IWfkD6mSH5OeMXezGU2QyR4VBs6nH3JuFjLM/jYsMTPxiUTp2S5L003 Jwe44FLoN0YGAQI9OeR4ogGRF+6qchujII4DSMBtJW6FrHX7OK0lMa1BQad2Juklwj4y HJKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SkTWxM2+KaU8xEUHCLJyIpONi7dBfIZEkICsMB0nbkY=; b=rhUkPSBDbMXL/vHBy6gudlZi1+Ez0PusgiXaVTm8nZcd5sT7Otf+ppco1N0DwpMSOP KZv0XeMgLa35LtXJe3QNI5EQqlo8urrgBjM2jcUMr2kmD9x7s+0+B5akiXUbMfNduZqU 5R+yUzrdtVV7l0HWaVHsluDNKNI2CuEPZwzRt/YeRAylFX5Lzkpa43tb8ge31xEM6xse +CZYzjVPRf4HyfNiS+k9m1InNEQ7PEqOxQhqpRJ7sjDKOIdTxYU+6z9MkE3POIj5Xeow HNUAtGnau4/CorF8S48uTbRx4Hx4JM9PPZgco5YvWBWXmXkO42vNuad7CiJhWmeSsLVa 2HIg== X-Gm-Message-State: AOAM5316jFPRUn/ukba6l2ZDCEODXD7BIX63YZkM+Q5j0B83GWzLpLZH 8eruYbPVBPatI/E8Eq7T25ExuKw4 X-Google-Smtp-Source: ABdhPJy9zZ9eoOvdc+oQhinqrfmQKfl4ePuS7fnItRcb7ZGWpLRmWVZN5AzdONCdJD8wh/alVoVaFw== X-Received: by 2002:a2e:8751:: with SMTP id q17mr6023365ljj.268.1595665149098; Sat, 25 Jul 2020 01:19:09 -0700 (PDT) Received: from localhost.localdomain (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id r14sm1071842lfe.29.2020.07.25.01.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 01:19:08 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Subject: [PATCH uhttpd] ubus: drop unused "obj" arguments Date: Sat, 25 Jul 2020 10:18:49 +0200 Message-Id: <20200725081850.32513-1-zajec5@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200725_041912_900262_AAC69FB9 X-CRM114-Status: UNSURE ( 8.19 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:243 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [zajec5[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [zajec5[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Jo-Philipp Wich Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki Both: uh_ubus_send_request() and uh_ubus_send_list() don't use it. Signed-off-by: Rafał Miłecki --- ubus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubus.c b/ubus.c index 97cc1e2..51c58b5 100644 --- a/ubus.c +++ b/ubus.c @@ -288,7 +288,7 @@ static void uh_ubus_single_error(struct client *cl, enum rpc_error type) ops->request_done(cl); } -static void uh_ubus_send_request(struct client *cl, json_object *obj, const char *sid, struct blob_attr *args) +static void uh_ubus_send_request(struct client *cl, const char *sid, struct blob_attr *args) { struct dispatch *d = &cl->dispatch; struct dispatch_ubus *du = &d->ubus; @@ -370,7 +370,7 @@ static void uh_ubus_list_cb(struct ubus_context *ctx, struct ubus_object_data *o blobmsg_close_table(data->buf, o); } -static void uh_ubus_send_list(struct client *cl, json_object *obj, struct blob_attr *params) +static void uh_ubus_send_list(struct client *cl, struct blob_attr *params) { struct blob_attr *cur, *dup; struct list_data data = { .buf = &cl->dispatch.ubus.buf, .verbose = false }; @@ -548,11 +548,11 @@ static void uh_ubus_handle_request_object(struct client *cl, struct json_object goto error; } - uh_ubus_send_request(cl, obj, data.sid, data.data); + uh_ubus_send_request(cl, data.sid, data.data); goto out; } else if (!strcmp(data.method, "list")) { - uh_ubus_send_list(cl, obj, data.params); + uh_ubus_send_list(cl, data.params); goto out; } else {