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

Use move when passed by value

Browse Source 
Also unduplicate code.
This commit is contained in:
Guillaume Munch 2016-06-23 22:07:13 +01:00
parent 4df8117a9d
commit 7d456a93e4
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/support/unicode.cpp
View File

@ -62,7 +62,7 @@ struct IconvProcessor::Handler {
IconvProcessor::IconvProcessor(string tocode, string fromcode)
: tocode_(tocode), fromcode_(fromcode)
: tocode_(move(tocode)), fromcode_(move(fromcode))
{}
@ -132,23 +132,11 @@ int IconvProcessor::convert(char const * buf, size_t buflen,
lyxerr << "E2BIG There is not sufficient room at *outbuf." << endl;
break;
case EILSEQ:
lyxerr << "EILSEQ An invalid multibyte sequence"
<< " has been encountered in the input.\n"
<< "When converting from " << fromcode_
<< " to " << tocode_ << ".\n";
lyxerr << "Input:" << hex;
for (size_t i = 0; i < buflen; ++i) {
// char may be signed, avoid output of
// something like 0xffffffc2
boost::uint32_t const b =
*reinterpret_cast<unsigned char const *>(buf + i);
lyxerr << " 0x" << (unsigned int)b;
}
lyxerr << dec << endl;
break;
case EINVAL:
lyxerr << "EINVAL An incomplete multibyte sequence"
<< " has been encountered in the input.\n"
lyxerr << (errno == EINVAL
? "EINVAL An incomplete "
: "EILSEQ An invalid ")
<< "multibyte sequence has been encountered in the input.\n"
<< "When converting from " << fromcode_
<< " to " << tocode_ << ".\n";
lyxerr << "Input:" << hex;