Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp208596pxb; Wed, 22 Sep 2021 20:29:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3yRTAZa8lT7uLMQpu4aLG1YIh+Mn2QML2ca8AzLSDUOv8OkD2S4hcOZtALKp9R1KcQuRW X-Received: by 2002:a17:906:2887:: with SMTP id o7mr2690727ejd.425.1632367759811; Wed, 22 Sep 2021 20:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632367759; cv=none; d=google.com; s=arc-20160816; b=LKq7WM29bHnT78tqzM3C0lE3wf6BfbpibOv7pb5q3UEzl0FkiPtkPYZAyk5W2erviP XWLGTW2w9DscOnYhEq3pPEbukAYFAqzaBtuqGmBHFLuNhQCMHnLpsQuCN24c8qZn33UY i+q10BsvkAQRYV2m8Jz9gdDBn1Tr6n3hF0JLLxYIQCrKZnpbO+FMTYZ12k7p9N3yW5Ac 4U/UnD7yu0LqEUXB8npjDjHIlM1PX1iunrwqoCLTp1RixxUKkDW4/nLUxjvujOh16Ci/ uiczbp/ZW54spiT4Ttdh5knL1j86HFVfzVGNroXA8/dHXm5a/NmrCQZjIfoApHDt85T6 UCHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=TBIi4GxhI5xTC+dwnYsq/oCZR2f2Mg9CwSq9S9qDvDc=; b=m83DzEJrIYM3qWSvu5ToEcd0jPlUPGipCfYKdiVBvHfYs7O9zAEWmNthjAg0tTvfJe U/5cGSKihSx+LWCbgFmGqZjQmDCpAAW0Bl8hSNh3cTU5BACrTrsZDFEpdG+H5XXaeWnD jRtpWLqhTs+n+TswGr9zpqw1y2C1AxpNCKG5+gj03Vi/aKrvPwnWfozd3CAzAQZ7fRKU KePDuSjIrmzioJAyJO8ITeBC3oslBrLZjuzUltLpVFO/RY66ZMkEOwWuA2GWf5MecLgW 8NKTtARgjHfU6BVDN8iP69WlGD//1/c1eED4NjxL+d9+mjhilolPDxhcglaJKVz1NX4X As/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s2si4698938ejs.755.2021.09.22.20.28.40; Wed, 22 Sep 2021 20:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239067AbhIWD2p (ORCPT + 99 others); Wed, 22 Sep 2021 23:28:45 -0400 Received: from mga11.intel.com ([192.55.52.93]:16381 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239050AbhIWD2o (ORCPT ); Wed, 22 Sep 2021 23:28:44 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="220555903" X-IronPort-AV: E=Sophos;i="5.85,315,1624345200"; d="scan'208";a="220555903" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 20:26:54 -0700 X-IronPort-AV: E=Sophos;i="5.85,315,1624345200"; d="scan'208";a="534072347" Received: from jdudwadk-mobl.amr.corp.intel.com (HELO istotlan-desk.intel.com) ([10.212.205.211]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 20:26:54 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ 06/20] tools/mesh-cfgclient: Overwrite config values when adding new ones Date: Wed, 22 Sep 2021 20:25:49 -0700 Message-Id: <20210923032603.50536-7-inga.stotland@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210923032603.50536-1-inga.stotland@intel.com> References: <20210923032603.50536-1-inga.stotland@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This changes common utilities used in mesh-db.c to replace old values by default whenever a new value is written. --- tools/mesh/mesh-db.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c index bf9344931..f0e0aeb71 100644 --- a/tools/mesh/mesh-db.c +++ b/tools/mesh/mesh-db.c @@ -54,6 +54,9 @@ static bool add_string(json_object *jobj, const char *desc, const char *str) if (!jstring) return false; + /* Overwrite old value if present */ + json_object_object_del(jobj, desc); + json_object_object_add(jobj, desc, jstring); return true; } @@ -69,8 +72,6 @@ static bool set_timestamp(json_object *jobj) strftime(buf, 80, "%FT%TZ", tp); - json_object_object_del(jobj, "timestamp"); - return add_string(jobj, "timestamp", buf); } @@ -190,12 +191,13 @@ static bool write_int(json_object *jobj, const char *keyword, int val) { json_object *jval; - json_object_object_del(jobj, keyword); - jval = json_object_new_int(val); if (!jval) return false; + /* Overwrite old value if present */ + json_object_object_del(jobj, keyword); + json_object_object_add(jobj, keyword, jval); return true; } @@ -222,12 +224,13 @@ static bool write_bool(json_object *jobj, const char *keyword, bool val) { json_object *jval; - json_object_object_del(jobj, keyword); - jval = json_object_new_boolean(val); if (!jval) return false; + /* Overwrite old value if present */ + json_object_object_del(jobj, keyword); + json_object_object_add(jobj, keyword, jval); return true; } @@ -262,6 +265,9 @@ static bool write_uint16_hex(json_object *jobj, const char *desc, if (!jstring) return false; + /* Overwrite old value if present */ + json_object_object_del(jobj, desc); + json_object_object_add(jobj, desc, jstring); return true; } @@ -327,6 +333,9 @@ static bool add_u8_8(json_object *jobj, const char *desc, if (!jstring) return false; + /* Overwrite old value if present */ + json_object_object_del(jobj, desc); + json_object_object_add(jobj, desc, jstring); return true; } @@ -342,6 +351,9 @@ static bool add_u8_16(json_object *jobj, const char *desc, if (!jstring) return false; + /* Overwrite old value if present */ + json_object_object_del(jobj, desc); + json_object_object_add(jobj, desc, jstring); return true; } -- 2.31.1