summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2014-10-24 17:59:57 +0200
committerDavid Wagner <david.wagner@intel.com>2014-10-24 17:59:57 +0200
commit9c51930a257e08a7171cf924ced36b0ab0dae208 (patch)
tree88dd6fd1f6aef4c3a37dac6ad9498882f10bdbb6
parent4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b (diff)
parent03b73847d00b46e5decda6f548b0c3ddf175cc76 (diff)
downloadexternal_parameter-framework-9c51930a257e08a7171cf924ced36b0ab0dae208.zip
external_parameter-framework-9c51930a257e08a7171cf924ced36b0ab0dae208.tar.gz
external_parameter-framework-9c51930a257e08a7171cf924ced36b0ab0dae208.tar.bz2
Merge pull request #15 from krocard/Remove_non_ascii_char
Remove non ascii char
-rw-r--r--parameter/ParameterMgr.cpp22
-rw-r--r--remote-processor/Message.cpp18
-rw-r--r--tools/xmlValidator/README.md36
3 files changed, 38 insertions, 38 deletions
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
index 0101dfb..b707225 100644
--- a/parameter/ParameterMgr.cpp
+++ b/parameter/ParameterMgr.cpp
@@ -104,17 +104,17 @@ const char* gacSystemSchemasSubFolder = "Schemas";
// Config File System looks normally like this:
// ---------------------------------------------
-//├── <ParameterFrameworkConfiguration>.xml
-//├── Schemas
-//│ └── *.xsd
-//├── Settings
-//│ └── <SystemClassName folder>*
-//│ ├── <ConfigurableDomains>.xml
-//│ └── <Settings>.bin?
-//└── Structure
-// └── <SystemClassName folder>*
-// ├── <SystemClassName>Class.xml
-// └── <Subsystem>.xml*
+//|-- <ParameterFrameworkConfiguration>.xml
+//|-- Schemas
+//| `-- *.xsd
+//|-- Settings
+//| `-- <SystemClassName folder>*
+//| |-- <ConfigurableDomains>.xml
+//| `-- <Settings>.bin?
+//`-- Structure
+// `-- <SystemClassName folder>*
+// |-- <SystemClassName>Class.xml
+// `-- <Subsystem>.xml*
// --------------------------------------------
diff --git a/remote-processor/Message.cpp b/remote-processor/Message.cpp
index 9df038c..ee3652d 100644
--- a/remote-processor/Message.cpp
+++ b/remote-processor/Message.cpp
@@ -155,21 +155,21 @@ CMessage::Result CMessage::serialize(CSocket* pSocket, bool bOut, string& strErr
if (!pSocket->write(&uiSize, sizeof(uiSize))) {
- strError += string("Size write failed: ") + strerror(errno);
+ strError += string("Size write failed: ") + strerror(errno);
return error;
}
// Msg Id
if (!pSocket->write(&_ucMsgId, sizeof(_ucMsgId))) {
- strError += string("Msg write failed: ") + strerror(errno);
+ strError += string("Msg write failed: ") + strerror(errno);
return error;
}
// Data
if (!pSocket->write(_pucData, _uiDataSize)) {
- strError = string("Data write failed: ") + strerror(errno);
+ strError = string("Data write failed: ") + strerror(errno);
return error;
}
@@ -178,7 +178,7 @@ CMessage::Result CMessage::serialize(CSocket* pSocket, bool bOut, string& strErr
if (!pSocket->write(&ucChecksum, sizeof(ucChecksum))) {
- strError = string("Checksum write failed: ") + strerror(errno);
+ strError = string("Checksum write failed: ") + strerror(errno);
return error;
}
@@ -188,7 +188,7 @@ CMessage::Result CMessage::serialize(CSocket* pSocket, bool bOut, string& strErr
if (!pSocket->read(&uiSyncWord, sizeof(uiSyncWord))) {
- strError = string("Sync read failed: ") + strerror(errno);
+ strError = string("Sync read failed: ") + strerror(errno);
if (pSocket->hasPeerDisconnected()) {
return peerDisconnected;
}
@@ -207,14 +207,14 @@ CMessage::Result CMessage::serialize(CSocket* pSocket, bool bOut, string& strErr
if (!pSocket->read(&uiSize, sizeof(uiSize))) {
- strError = string("Size read failed: ") + strerror(errno);
+ strError = string("Size read failed: ") + strerror(errno);
return error;
}
// Msg Id
if (!pSocket->read(&_ucMsgId, sizeof(_ucMsgId))) {
- strError = string("Msg id read failed: ") + strerror(errno);
+ strError = string("Msg id read failed: ") + strerror(errno);
return error;
}
@@ -226,7 +226,7 @@ CMessage::Result CMessage::serialize(CSocket* pSocket, bool bOut, string& strErr
// Data receive
if (!pSocket->read(_pucData, _uiDataSize)) {
- strError = string("Data read failed: ") + strerror(errno);
+ strError = string("Data read failed: ") + strerror(errno);
return error;
}
@@ -235,7 +235,7 @@ CMessage::Result CMessage::serialize(CSocket* pSocket, bool bOut, string& strErr
if (!pSocket->read(&ucChecksum, sizeof(ucChecksum))) {
- strError = string("Checksum read failed: ") + strerror(errno);
+ strError = string("Checksum read failed: ") + strerror(errno);
return error;
}
// Compare
diff --git a/tools/xmlValidator/README.md b/tools/xmlValidator/README.md
index 11d64a6..c50f33e 100644
--- a/tools/xmlValidator/README.md
+++ b/tools/xmlValidator/README.md
@@ -27,24 +27,24 @@ where:
In the example, we have the following files:
- ├── ParameterFrameworkConfiguration.xml
- ├── Schemas
- │ ├── ComponentLibrary.xsd
- │ ├── ComponentTypeSet.xsd
- │ ├── ConfigurableDomains.xsd
- │ ├── FileIncluder.xsd
- │ ├── ParameterFrameworkConfiguration.xsd
- │ ├── ParameterSettings.xsd
- │ ├── Parameter.xsd
- │ ├── Subsystem.xsd
- │ └── SystemClass.xsd
- ├── Settings
- │ └── FS
- │ └── Genres.xml
- └── Structure
- └── FS
- ├── MusicLibraries.xml
- └── my_music.xml
+ |-- ParameterFrameworkConfiguration.xml
+ |-- Schemas
+ | |-- ComponentLibrary.xsd
+ | |-- ComponentTypeSet.xsd
+ | |-- ConfigurableDomains.xsd
+ | |-- FileIncluder.xsd
+ | |-- ParameterFrameworkConfiguration.xsd
+ | |-- ParameterSettings.xsd
+ | |-- Parameter.xsd
+ | |-- Subsystem.xsd
+ | `-- SystemClass.xsd
+ |-- Settings
+ | `-- FS
+ | `-- Genres.xml
+ `--- Structure
+ `-- FS
+ |-- MusicLibraries.xml
+ `-- my_music.xml
### Command
We are in the directory which contains the structure detailed previously.