From patchwork Fri Sep 15 10:35:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 814202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::237; helo=mail-lf0-x237.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb66253gqkgqeu45emyi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="rTGKR36B"; dkim-atps=neutral Received: from mail-lf0-x237.google.com (mail-lf0-x237.google.com [IPv6:2a00:1450:4010:c07::237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xtsL80NDlz9sxR for ; Fri, 15 Sep 2017 20:37:51 +1000 (AEST) Received: by mail-lf0-x237.google.com with SMTP id n9sf339797lfb.14 for ; Fri, 15 Sep 2017 03:37:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1505471868; cv=pass; d=google.com; s=arc-20160816; b=YIb/CImdym43Ntxo4G9pKW/fHQNpQeE8KH+gwF4WAjMyzZG7MXlQyesOfvenzqSk8n NlE/xI2Js8ydMmmtzVtyiHg+S1BvJbkZyWPNkEaPKF4ebWLXwLlgCCNolu1SMXMPQaIF DRb/G26SDnqfoh8nSAnAc69b6ZR6eGQjC62t4Lmc5xFeQX4UgGjZqWic9qIxnyOxHeda S3QbBopAJUPBsyG7SEWpV1M4IJWjkCtSE0Cw8qcASIfet4rs1XkzSOjbpwvXjGfhIe+o YPsvZDwRzfmhaMdLUejcQggBeden3El9AWWaS1k9+gxvW4WYS+a+Yhc4gylChTQzASpR Tc8w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=wcima6LvKbjSx0dKt5ip+q8yK1LooONALrgyzprJNSM=; b=EH0irLB9J7YT9fkvmn5iSo6DJVHPefZbKV5n1qoZmJBdusDhOutahBBp1QQdicT4nX ZVGhJAvhXrG8O6TuYW9Z6Nu5iSZEN7DgOXIkYPvht6m+z1LNMT3xH6YyISxRLWPsoKv3 0RnnYdcBh9BDvfl4FQBbSoLEXNwbgiSBzfXW2xLbhK21Q4DnDgASLShioFP0ZjmIL+oA pDPPTAPypXzGxveaR3WR9Piu7Ea8XxLZtGXR14EPKCAIB5zL5tkcrtGogqgZ3O3MEAFu z2SNB4aMgaD5b/TLCATIXo2dBNuTOafCAHQ1BAzv1CJ7fCguek8+Iz5pXrtFAVVOtoR2 6gbA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of christian.storm@siemens.com) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=wcima6LvKbjSx0dKt5ip+q8yK1LooONALrgyzprJNSM=; b=rTGKR36BmRboFWGf8fK61O1Unq0nilfki2gLgb31aqOWKuHrh+DBpkw4F7/uia6WK6 48jBvcqP7jXF+s/UCkMVGtF437TMo+cpVrtRuDxGofDWKVZGAr14Qbh3gHWeZ2m9s/mi 26Dun34OIbPyQJjEzD9bg9SV+gDsDtQPtZCyJRztd0JkWMboM8TzzfThM/LXfdSRYt+x GUGgdAMo2QcZfoxjZKU9yrgBScEBT48v7UIkrE7ZdCR0JYTaA5d6uOJ3BkrgkYi9I23D /Z0IwFjaVD34v2EwWfME76TVgnPiKXMhDyJIiGwMvz+8aBKwWykHM+/ZDPSPOnd/tGi6 7D8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=wcima6LvKbjSx0dKt5ip+q8yK1LooONALrgyzprJNSM=; b=F4+LZrsoxA21eT1/P9dXXgVHtp+eMcsdZTW5IE4VoGSNHal7vb0/F+j4CxyV8jGx4S 7Z/fyABd20uSYJgCDp8hiHMMYfZpd/g8Swgg5ygk/Trb1OCe4Tv3pblNvBDRNEgmkdwt 0i/BfMPbq3eN4hwVKTREe75Ujo9zFvUmkrM1qGUuz8zn0u5EE1Noao0BIzt2XGDfFCrm RS8G439k+64PXNebXmGDOQy6fON6956CaFBESv4HuUicoy9qzhIljbWMqWrtnB5Wsijm MyOa3MAYTlpyJ4sPibuGB8n3P1cM+BV/76evfRPGN/IVsj4BfqQb2Uu15ikdy53Xkq7t STQA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AHPjjUhfy4ySZ0hTQqidJbOS3j7A9m/FBqL/tKKxTtliFSaoTLZ5JG5e ahx7l0d4Xg9HFg== X-Google-Smtp-Source: AOwi7QBhOqtFNeXPZA37SD5ke7wbYtUNwWlhBUHI4B8fdylTXoGzbNEwEl772YQqx4M7AqF3Ob1ORA== X-Received: by 10.46.99.220 with SMTP id s89mr61744lje.26.1505471867972; Fri, 15 Sep 2017 03:37:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.25.198.16 with SMTP id w16ls258173lff.24.gmail; Fri, 15 Sep 2017 03:37:47 -0700 (PDT) X-Received: by 10.25.92.197 with SMTP id u66mr121425lfi.10.1505471867253; Fri, 15 Sep 2017 03:37:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505471867; cv=none; d=google.com; s=arc-20160816; b=shUsRGoCJyQES6kx+Oc/ihHarj5IyyLiFQQ/javNDRtAFN1KslnAnJOJNQ17GuHzxc HNMKmA0WuMlGR2xiJfL3gV4Ec/4o1Via/U58yhRdF5+6Vz5Dx80F+Q1txA8O6ORU9aFI oOpVL/VoxDhEPVugfNktfGv6RBZFW11jk6h6q46CgJ1MYRoreQhs0ToHWtjWmyA9OyQO eoSPpZ3SuM0PLjeqGhWIZZZTxySRNhXVR2NE8PFTeJJoybgtXzLcTDjykdUncx3eP4x5 V06RETEG8DaO2htnIcVpAyu2Wy+ysMK070B/R5JeAeSgqTQEy5Iu2jbrsPJ/ngHVbb43 Bu7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=jxDOhaNx5QAmq0WF6d1wSKC4cjiZFSQV0xc1xQu2ctw=; b=cD2XAWoQi9Qfx2B7rXdbjn/27XhIw36kW6yjy1gqM6PrffoTZsLfG+t4GZTIRyuzB0 tRvRhNtOcgwY6QsZ5po5ECI6PNFHyMV+CBN/sROZ9JZNawyhErfelsqEm7piZEzj0ELT H8alXEqolrS7zyq6NGdZIiqj19ITL1c2W5Ek7GsIPvi6eNkdR+HEAXYiE4JH5eh+8htg mEHL/hnpTIenJ+8YJE0FWduDgNgh2ku+wpnk4IMcz5DKcHXjUq8FVGDDdv7po3Fml+jh mu5sOWiGXtSlsoldRDC/reXLbWdF0rg4V8fI5ovZQDL5PhbhY/SHOnl7ynZzxc64bLWH PNEw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of christian.storm@siemens.com) smtp.mailfrom=christian.storm@siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id p200si8763wmg.4.2017.09.15.03.37.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 03:37:47 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of christian.storm@siemens.com) client-ip=192.35.17.14; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v8FAbkWQ019074 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Sep 2017 12:37:46 +0200 Received: from MD1KR9XC.ad001.siemens.net ([139.25.69.251]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v8FAbkOq018391; Fri, 15 Sep 2017 12:37:46 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] parser: fix warnings for !JSON && !LIBCONFIG Date: Fri, 15 Sep 2017 12:35:11 +0200 Message-Id: <20170915103511.20122-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.14.1 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of christian.storm@siemens.com) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Fix travis's complaint about unused parameters and functions for !CONFIG_JSON && !CONFIG_LIBCONFIG. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- corelib/parsing_library.c | 16 ++++++++++++++++ parser/parser.c | 2 ++ 2 files changed, 18 insertions(+) diff --git a/corelib/parsing_library.c b/corelib/parsing_library.c index 1484141..eb3001f 100644 --- a/corelib/parsing_library.c +++ b/corelib/parsing_library.c @@ -52,6 +52,8 @@ int get_array_length(parsertype p, void *root) return config_setting_length(root); case JSON_PARSER: return json_object_array_length(root); + default: + (void)root; } return 0; @@ -64,6 +66,9 @@ void *get_elem_from_idx(parsertype p, void *node, int idx) return config_setting_get_elem(node, idx); case JSON_PARSER: return json_object_array_get_idx(node, idx); + default: + (void)node; + (void)idx; } return NULL; @@ -76,6 +81,9 @@ const char *get_field_string(parsertype p, void *e, const char *path) return get_field_string_libconfig(e, path); case JSON_PARSER: return get_field_string_json(e, path); + default: + (void)e; + (void)path; } return NULL; @@ -98,6 +106,10 @@ void get_field(parsertype p, void *e, const char *path, void *dest) return get_field_cfg((config_setting_t *)e, path, dest); case JSON_PARSER: return get_field_json((json_object *)e, path, dest); + default: + (void)e; + (void)path; + (void)dest; } } @@ -110,6 +122,10 @@ int exist_field_string(parsertype p, void *e, const char *path) path, &str); case JSON_PARSER: return json_object_object_get_ex((json_object *)e, path, NULL); + default: + (void)str; + (void)e; + (void)path; } return 0; diff --git a/parser/parser.c b/parser/parser.c index c8a51e2..c962b59 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -138,6 +138,7 @@ static json_object *find_node_json(json_object *root, const char *node, } #endif +#if defined(CONFIG_LIBCONFIG) || defined(CONFIG_JSON) static void *find_node(parsertype p, void *root, const char *node, struct swupdate_cfg *swcfg) { @@ -587,6 +588,7 @@ static int parser(parsertype p, void *cfg, struct swupdate_cfg *swcfg) return ret; } +#endif #ifdef CONFIG_LIBCONFIG int parse_cfg (struct swupdate_cfg *swcfg, const char *filename)