From 95ea4d93f31371978f0c6d969963fc6b3f58ce81 Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <arto.kinnunen@arm.com>
Date: Wed, 21 Apr 2021 10:17:33 +0300
Subject: [PATCH] Squashed 'connectivity/libraries/nanostack-libservice/'
 changes from a526cc3f41..260d80f42d

260d80f42d Update ns_nvm_helper license text and format (#98)

git-subtree-dir: connectivity/libraries/nanostack-libservice
git-subtree-split: 260d80f42da24fa41656222294abc38f7779bdcf
---
 mbed-client-libservice/ns_nvm_helper.h | 32 ++++++++++++--------------
 source/nvmHelper/ns_nvm_helper.c       | 32 ++++++++++++--------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/mbed-client-libservice/ns_nvm_helper.h b/mbed-client-libservice/ns_nvm_helper.h
index b59c9b29efd..aea476a0af3 100644
--- a/mbed-client-libservice/ns_nvm_helper.h
+++ b/mbed-client-libservice/ns_nvm_helper.h
@@ -1,20 +1,18 @@
-// ----------------------------------------------------------------------------
-// Copyright 2016-2017 ARM Ltd.
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ----------------------------------------------------------------------------
+/*
+ * Copyright (c) 2016-2017 ARM Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 /**
  * NanoStack NVM helper functions to read, write and delete key-value pairs to platform NVM.
diff --git a/source/nvmHelper/ns_nvm_helper.c b/source/nvmHelper/ns_nvm_helper.c
index af07e05bf4c..eea820951ec 100644
--- a/source/nvmHelper/ns_nvm_helper.c
+++ b/source/nvmHelper/ns_nvm_helper.c
@@ -1,20 +1,18 @@
-// ----------------------------------------------------------------------------
-// Copyright 2016-2017 ARM Ltd.
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ----------------------------------------------------------------------------
+/*
+ * Copyright (c) 2016-2017 ARM Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include <string.h>
 #include <ns_types.h>