From ace81f873b910493ab884dc5a6a38ba6ec3d56d3 Mon Sep 17 00:00:00 2001
From: Kevin Rocard <kevinx.rocard@intel.com>
Date: Tue, 11 Dec 2012 16:19:17 +0100
Subject: PFW: Do not stop on hard sync errors

BZ: 76263

When synchronization fails, the parameter-framework should
log a warning and continue synchronization instead of stopping

Change-Id: Ic12d8798ea25584db714ee26e644fac793c28881
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
Reviewed-on: http://android.intel.com:8080/81825
Reviewed-by: Centelles, Sylvain <sylvain.centelles@intel.com>
Reviewed-by: Denneulin, Guillaume <guillaume.denneulin@intel.com>
Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>
---
 utility/Android.mk  |  4 +++-
 utility/Utility.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 utility/Utility.h   | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 utility/Utility.cpp
 create mode 100644 utility/Utility.h

(limited to 'utility')

diff --git a/utility/Android.mk b/utility/Android.mk
index f6af488..acdf6a1 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -3,7 +3,9 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 
-LOCAL_SRC_FILES:= Tokenizer.cpp
+LOCAL_SRC_FILES:= \
+    Tokenizer.cpp \
+    Utility.cpp
 
 LOCAL_MODULE:= libutility
 
diff --git a/utility/Utility.cpp b/utility/Utility.cpp
new file mode 100644
index 0000000..afedc07
--- /dev/null
+++ b/utility/Utility.cpp
@@ -0,0 +1,46 @@
+/*
+ * INTEL CONFIDENTIAL
+ * Copyright © 2011 Intel
+ * Corporation All Rights Reserved.
+ *
+ * The source code contained or described herein and all documents related to
+ * the source code ("Material") are owned by Intel Corporation or its suppliers
+ * or licensors. Title to the Material remains with Intel Corporation or its
+ * suppliers and licensors. The Material contains trade secrets and proprietary
+ * and confidential information of Intel or its suppliers and licensors. The
+ * Material is protected by worldwide copyright and trade secret laws and
+ * treaty provisions. No part of the Material may be used, copied, reproduced,
+ * modified, published, uploaded, posted, transmitted, distributed, or
+ * disclosed in any way without Intel’s prior express written permission.
+ *
+ * No license under any patent, copyright, trade secret or other intellectual
+ * property right is granted to or conferred upon you by disclosure or delivery
+ * of the Materials, either expressly, by implication, inducement, estoppel or
+ * otherwise. Any license under such intellectual property rights must be
+ * express and approved by Intel in writing.
+ *
+ * CREATED: 2012-12-17
+ */
+
+#include "Utility.h"
+
+// Concatenate string list
+void CUtility::concatenate(const std::list<std::string>& lstr, std::string& strOutput, const std::string& strSeparator)
+{
+    bool bStart = true;
+
+    std::list<std::string>::const_iterator iterator(lstr.begin());
+    std::list<std::string>::const_iterator end(lstr.end());
+
+    while (iterator != end) {
+
+        if (bStart) {
+            // Do not add a separator before first element
+            bStart = false;
+        } else {
+            // Add the separator bettween each element
+            strOutput += strSeparator;
+        }
+        strOutput += *iterator++;
+    }
+}
diff --git a/utility/Utility.h b/utility/Utility.h
new file mode 100644
index 0000000..7c395c0
--- /dev/null
+++ b/utility/Utility.h
@@ -0,0 +1,38 @@
+/*
+ * INTEL CONFIDENTIAL
+ * Copyright © 2011 Intel
+ * Corporation All Rights Reserved.
+ *
+ * The source code contained or described herein and all documents related to
+ * the source code ("Material") are owned by Intel Corporation or its suppliers
+ * or licensors. Title to the Material remains with Intel Corporation or its
+ * suppliers and licensors. The Material contains trade secrets and proprietary
+ * and confidential information of Intel or its suppliers and licensors. The
+ * Material is protected by worldwide copyright and trade secret laws and
+ * treaty provisions. No part of the Material may be used, copied, reproduced,
+ * modified, published, uploaded, posted, transmitted, distributed, or
+ * disclosed in any way without Intel’s prior express written permission.
+ *
+ * No license under any patent, copyright, trade secret or other intellectual
+ * property right is granted to or conferred upon you by disclosure or delivery
+ * of the Materials, either expressly, by implication, inducement, estoppel or
+ * otherwise. Any license under such intellectual property rights must be
+ * express and approved by Intel in writing.
+ *
+ * CREATED: 2012-12-17
+ */
+
+#ifndef UTILITY_H
+#define UTILITY_H
+
+#include <string>
+#include <list>
+
+class CUtility
+{
+public:
+    // Concatenate string list
+    static void concatenate(const std::list<std::string>& lstr, std::string& strOutput, const std::string& separator = "\n");
+};
+
+#endif // UTILITY_H
-- 
cgit v1.1