From patchwork Fri Dec 8 14:19:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 846267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TmYhfWq5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CDjfQMDu"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ytZJ95RP5z9t7x for ; Sat, 9 Dec 2017 01:20:25 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date: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=LtYudRINzLiVwMc6wZ/V6PyjpUZOwCJbObZcHuAdr3U=; b=TmYhfWq5lPqIv+ 3jQl2r8cL5VYTylYrPb6jXCItAUMpid3o1/gMumLEIqteFV0OHI7Gh4yqe5ATzK677dJO5dYhHBU/ f0oOIy/WeNAuEnsCj5w9HmirmhORZ4HElzXFvA74kZZb+KzBPwlfvX327xSMiFMKpQqHOHdmsXCh3 d+Bjncs58eW5xxdeo4upL6ud7v12JlfW+mvROEPDDZucMUDmndJaq6mbQsElr9GG7R1YpB1zCZwCC cSi6R69twikZ4qVlxSkXCNY7p8Jm2qYrqdBMYHWwJ66MU8BtfANcpvHhUIOsDy4P8NuBRhgHZMIhG L0mDs96Wme9crMEeeUpw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eNJVn-0003H8-1q; Fri, 08 Dec 2017 14:20:23 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eNJVS-0001YC-CL for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 14:20:06 +0000 Received: by mail-wr0-x243.google.com with SMTP id k61so10959028wrc.4 for ; Fri, 08 Dec 2017 06:19:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=GS3rXFqTUlErrBWB3eDIMVDARtNvlrx/8e3QOQLKzVM=; b=CDjfQMDuVp+dEjo9Ppt0R/szcDmXVGqMgf4U+MsmavdDgSdszAO8UucKiaow6yhI4+ wq2MFSeVSfc/VhYnWoRnLfxYRh/DfCi4T4jlUNhhT4xFPQsYIo1g5REwL8b8htTnxJvL enRBb8QhrCm0dusJV2MUEAEXkQzrw8cMKTWdCHwtz6M59f98ra5qU3BxYJ2W6GIS/7Ri xREGP4MFCnAzPjIo/REkbpkCF7BTDqyvEg6A2Qh3lwoaGcPTaXfUvYM3yUB2lrtHuQPA WjJUg+9Yha5uGiCWC7DznyU5o1xbKsEVbE9sVkCJ58Vh23uvuoBQdW5JrMrCJNGkFc2n 1Zfw== 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; bh=GS3rXFqTUlErrBWB3eDIMVDARtNvlrx/8e3QOQLKzVM=; b=kZjKn2DFXKm9KzcOXjewhWDLCUDWbpkgV1tdULDYeBsqWqJtjsaMGMKbKtVXnhlIZ7 5Dy4lGGKxhrRz3pLqyhxTDmQJjvTu3p0hUHHL5v8KEqJG1SPcfGx3pA8ul1qGSAcMaLh tZRsZ4HVo0ZO6Kk/+FgN9vaUqB1QMkkyLaUBnaGsgWkzpVARX1Sx0XDqBewFE4lyNt84 0wjOsoIcnDx4ADBTeCx1qyHQZ5K5QJHx5BagO4PGGRyOHN05Ye4XGjYUnJB9L80fAkY+ d3n/eHobhQYeOJx35Evg6OP0pGlgI4Na4hTpOsYEiH9Tyfm7ZjYw1rjGloIa/Mo9x5PR i5pg== X-Gm-Message-State: AJaThX75LCvI16FZLAiQsutD4OSx3S2Kc8mr95uVk/a2AlHYQ/3AT6vJ 8ZDgiJJk6VuNsxDlcaUo9dBpAw== X-Google-Smtp-Source: AGs4zMbJCVHZVfwmWEkpikPAn9wHJ7Gx96+lxKZIx0bgQsAaHiCA+M7EAFGTzvqBC/73eikV+2i54w== X-Received: by 10.223.130.17 with SMTP id 17mr25788279wrb.131.1512742778544; Fri, 08 Dec 2017 06:19:38 -0800 (PST) Received: from localhost.localdomain ([5.2.196.146]) by smtp.gmail.com with ESMTPSA id c3sm8408717wrf.21.2017.12.08.06.19.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 06:19:37 -0800 (PST) From: Alexandru Ardelean To: lede-dev@lists.infradead.org Date: Fri, 8 Dec 2017 16:19:23 +0200 Message-Id: <20171208141923.18780-1-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171208_062002_946965_1C0540A4 X-CRM114-Status: UNSURE ( 8.05 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ardeleanalex[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] handler: replace is_error() helper with NULL check X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandru Ardelean MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The `is_error()` is just a macro that checks that object is NULL (which is considered an error in libjson-c terminology). Newer libjson-c versions have deprecated this. Signed-off-by: Alexandru Ardelean --- handler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handler.c b/handler.c index 0c4627f..a0b2a57 100644 --- a/handler.c +++ b/handler.c @@ -105,7 +105,7 @@ netifd_parse_script_handler(const char *name, script_dump_cb cb) tok = json_tokener_new(); obj = json_tokener_parse_ex(tok, start, len); - if (!is_error(obj)) { + if (obj) { netifd_init_script_handler(name, obj, cb); json_object_put(obj); json_tokener_free(tok);