openharmony/developtools_global_resource_tool
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_global_resource_tool.git synced 2026-07-21 06:55:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

log信息统一整改

Browse Source 
Signed-off-by: fangyunzhong <fangyunzhong2@huawei.com>
This commit is contained in:
fangyunzhong
2022-11-23 10:16:48 +08:00
parent 81cc54b2fb
commit 6576a77829
22 changed files with 167 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/reference_parser.cpp
+8 -7
View File
@@ -182,7 +182,7 @@ bool ReferenceParser::ParseRefResourceItem(ResourceItem &resourceItem) const
if (IsStringOfResourceItem(resType)) {
data = string(reinterpret_cast<const char *>(resourceItem.GetData()), resourceItem.GetDataLength());
if (!ParseRefString(data, update)) {
cerr << "Error: in " << resourceItem.GetFilePath() << endl;
cerr << "Error: " << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
if (!update) {
@@ -197,7 +197,8 @@ bool ReferenceParser::ParseRefResourceItem(ResourceItem &resourceItem) const
}
}
if (update && !resourceItem.SetData(reinterpret_cast<const int8_t *>(data.c_str()), data.length())) {
cerr << "Error: set data fail '" << resourceItem.GetName() << "' in " << resourceItem.GetFilePath() << endl;
cerr << "Error: set data fail. name = '" << resourceItem.GetName() << "' data = '" << data << "'.";
cerr << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
return true;
@@ -208,15 +209,15 @@ bool ReferenceParser::ParseRefResourceItemData(const ResourceItem &resourceItem,
data = string(reinterpret_cast<const char *>(resourceItem.GetData()), resourceItem.GetDataLength());
vector<string> contents = ResourceUtil::DecomposeStrings(data);
if (contents.empty()) {
cerr << "Error: DecomposeStrings fail '" << resourceItem.GetName() << "' in ";
cerr << resourceItem.GetFilePath() << endl;
cerr << "Error: DecomposeStrings fail. name = '" << resourceItem.GetName() << "' data = '" << data << "'.";
cerr << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
for (auto &content : contents) {
bool flag = false;
if (!ParseRefString(content, flag)) {
cerr << "Error: in " << resourceItem.GetFilePath() << endl;
cerr << "Error: " << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
update = (update || flag);
@@ -228,8 +229,8 @@ bool ReferenceParser::ParseRefResourceItemData(const ResourceItem &resourceItem,
data = ResourceUtil::ComposeStrings(contents);
if (data.empty()) {
cerr << "Error: ComposeStrings fail '" << resourceItem.GetName() << "' in ";
cerr << resourceItem.GetFilePath() << endl;
cerr << "Error: ComposeStrings fail. name = '" << resourceItem.GetName();
cerr << "' contents size is " << contents.size() << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
return true;