diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-12 13:13:07 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-12 13:14:02 +0100 |
commit | c35e4a4b7d7c4da06f0f38f6f669f05d04f4537a (patch) | |
tree | 9ab9e5b23d636edceb6bc4916121e0cb86596d39 /utils | |
parent | 0f72c73b5b6f8ef12da726c5a7229f8076cd98f0 (diff) | |
download | rockbox-c35e4a4b7d7c4da06f0f38f6f669f05d04f4537a.tar.gz rockbox-c35e4a4b7d7c4da06f0f38f6f669f05d04f4537a.zip |
Fix red
Change-Id: Ib64eb3539e33d4336c298612b4508c4611b80c9e
Diffstat (limited to 'utils')
-rw-r--r-- | utils/hwstub/tools/hwstub_shell.cpp | 10 | ||||
-rw-r--r-- | utils/regtools/lib/soc_desc.cpp | 4 | ||||
-rw-r--r-- | utils/regtools/lib/soc_desc.hpp | 2 | ||||
-rw-r--r-- | utils/regtools/qeditor/backend.cpp | 5 |
4 files changed, 12 insertions, 9 deletions
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp index 3cc6f8c259..61cb617509 100644 --- a/utils/hwstub/tools/hwstub_shell.cpp +++ b/utils/hwstub/tools/hwstub_shell.cpp | |||
@@ -647,13 +647,13 @@ bool my_lua_import_soc(const soc_t& soc) | |||
647 | return true; | 647 | return true; |
648 | } | 648 | } |
649 | 649 | ||
650 | bool my_lua_import_soc(const std::list< soc_t >& socs) | 650 | bool my_lua_import_soc(const std::vector< soc_t >& socs) |
651 | { | 651 | { |
652 | for(std::list< soc_t >::const_iterator it = socs.begin(); it != socs.end(); ++it) | 652 | for(size_t i = 0; i < socs.size(); i++) |
653 | { | 653 | { |
654 | if(!g_quiet) | 654 | if(!g_quiet) |
655 | printf("importing %s...\n", it->name.c_str()); | 655 | printf("importing %s...\n", socs[i].name.c_str()); |
656 | if(!my_lua_import_soc(*it)) | 656 | if(!my_lua_import_soc(socs[i])) |
657 | return false; | 657 | return false; |
658 | } | 658 | } |
659 | return true; | 659 | return true; |
@@ -711,7 +711,7 @@ int main(int argc, char **argv) | |||
711 | } | 711 | } |
712 | 712 | ||
713 | // load register descriptions | 713 | // load register descriptions |
714 | std::list< soc_t > socs; | 714 | std::vector< soc_t > socs; |
715 | for(int i = optind; i < argc; i++) | 715 | for(int i = optind; i < argc; i++) |
716 | if(!soc_desc_parse_xml(argv[i], socs)) | 716 | if(!soc_desc_parse_xml(argv[i], socs)) |
717 | { | 717 | { |
diff --git a/utils/regtools/lib/soc_desc.cpp b/utils/regtools/lib/soc_desc.cpp index 223a6d8f53..21c2f8acac 100644 --- a/utils/regtools/lib/soc_desc.cpp +++ b/utils/regtools/lib/soc_desc.cpp | |||
@@ -252,7 +252,7 @@ bool parse_soc_elem(xmlNode *node, soc_t& soc) | |||
252 | return true; | 252 | return true; |
253 | } | 253 | } |
254 | 254 | ||
255 | bool parse_root_elem(xmlNode *node, std::list< soc_t >& soc) | 255 | bool parse_root_elem(xmlNode *node, std::vector< soc_t >& soc) |
256 | { | 256 | { |
257 | BEGIN_NODE_MATCH(node) | 257 | BEGIN_NODE_MATCH(node) |
258 | MATCH_ELEM_NODE("soc", soc, parse_soc_elem) | 258 | MATCH_ELEM_NODE("soc", soc, parse_soc_elem) |
@@ -260,7 +260,7 @@ bool parse_root_elem(xmlNode *node, std::list< soc_t >& soc) | |||
260 | return true; | 260 | return true; |
261 | } | 261 | } |
262 | 262 | ||
263 | bool soc_desc_parse_xml(const std::string& filename, std::list< soc_t >& socs) | 263 | bool soc_desc_parse_xml(const std::string& filename, std::vector< soc_t >& socs) |
264 | { | 264 | { |
265 | LIBXML_TEST_VERSION | 265 | LIBXML_TEST_VERSION |
266 | 266 | ||
diff --git a/utils/regtools/lib/soc_desc.hpp b/utils/regtools/lib/soc_desc.hpp index d1a1f0cb50..0324a90fad 100644 --- a/utils/regtools/lib/soc_desc.hpp +++ b/utils/regtools/lib/soc_desc.hpp | |||
@@ -143,6 +143,6 @@ struct soc_t | |||
143 | 143 | ||
144 | /** Parse a SoC description from a XML file, append it to <soc>. A file | 144 | /** Parse a SoC description from a XML file, append it to <soc>. A file |
145 | * can contain multiple SoC descriptions */ | 145 | * can contain multiple SoC descriptions */ |
146 | bool soc_desc_parse_xml(const std::string& filename, std::list< soc_t >& soc); | 146 | bool soc_desc_parse_xml(const std::string& filename, std::vector< soc_t >& soc); |
147 | 147 | ||
148 | #endif /* __SOC_DESC__ */ \ No newline at end of file | 148 | #endif /* __SOC_DESC__ */ \ No newline at end of file |
diff --git a/utils/regtools/qeditor/backend.cpp b/utils/regtools/qeditor/backend.cpp index 44430c25da..15867821e3 100644 --- a/utils/regtools/qeditor/backend.cpp +++ b/utils/regtools/qeditor/backend.cpp | |||
@@ -33,7 +33,10 @@ bool Backend::GetSocByName(const QString& name, SocRef& s) | |||
33 | 33 | ||
34 | bool Backend::LoadSocDesc(const QString& filename) | 34 | bool Backend::LoadSocDesc(const QString& filename) |
35 | { | 35 | { |
36 | bool ret = soc_desc_parse_xml(filename.toStdString(), m_socs); | 36 | std::vector< soc_t > new_socs; |
37 | bool ret = soc_desc_parse_xml(filename.toStdString(), new_socs); | ||
38 | for(size_t i = 0; i < new_socs.size(); i++) | ||
39 | m_socs.push_back(new_socs[i]); | ||
37 | emit OnSocListChanged(); | 40 | emit OnSocListChanged(); |
38 | return ret; | 41 | return ret; |
39 | } | 42 | } |