anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix unreachable code

Browse Source 
Coverity issues 23292 and 23297.
This commit is contained in:
Jean-Marc 2015-09-12 18:05:08 +02:00
parent a22f7b7001
commit eba0bbe503
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/support/lstrings.cpp
View File

@ -1074,18 +1074,20 @@ String const doSplit(String const & a, String & piece, Char delim)
size_t i = a.find(delim); size_t i = a.find(delim);
if (i == a.length() - 1) { if (i == a.length() - 1) {
piece = a.substr(0, i); piece = a.substr(0, i);
} else if (i != String::npos) {
piece = a.substr(0, i);
tmp = a.substr(i + 1);
} else if (i == 0) { } else if (i == 0) {
piece.erase(); piece.erase();
tmp = a.substr(i + 1); tmp = a.substr(i + 1);
} else if (i != String::npos) {
piece = a.substr(0, i);
tmp = a.substr(i + 1);
} else { } else {
piece = a; piece = a;
} }
return tmp; return tmp;
} }
// FIXME: why is this specialization needed?
template<typename Char> inline template<typename Char> inline
docstring const doSplit(docstring const & a, docstring & piece, Char delim) docstring const doSplit(docstring const & a, docstring & piece, Char delim)
{ {
@ -1093,12 +1095,12 @@ docstring const doSplit(docstring const & a, docstring & piece, Char delim)
size_t i = a.find(delim); size_t i = a.find(delim);
if (i == a.length() - 1) { if (i == a.length() - 1) {
piece = a.substr(0, i); piece = a.substr(0, i);
} else if (i != docstring::npos) {
piece = a.substr(0, i);
tmp = a.substr(i + 1);
} else if (i == 0) { } else if (i == 0) {
piece.erase(); piece.erase();
tmp = a.substr(i + 1); tmp = a.substr(i + 1);
} else if (i != docstring::npos) {
piece = a.substr(0, i);
tmp = a.substr(i + 1);
} else { } else {
piece = a; piece = a;
} }