struct IconvProcessor::Handler {
// assumes cd is valid
- Handler(iconv_t const cd) : cd(cd) {}
+ explicit Handler(iconv_t const cd) : cd(cd) {}
~Handler() {
if (iconv_close(cd) == -1)
LYXERR0("Error returned from iconv_close(" << errno << ')');
// flush out remaining data. This is needed because iconv sometimes
// holds back chars in the stream, waiting for a combination character
// (see e.g. http://sources.redhat.com/bugzilla/show_bug.cgi?id=1124)
- iconv(h_->cd, NULL, NULL, &outbuf, &outbytesleft);
+ iconv(h_->cd, nullptr, nullptr, &outbuf, &outbytesleft);
//lyxerr << dec;
//lyxerr << "Inbytesleft: " << inbytesleft << endl;
if (it == processors.end()) {
IconvProcessor p(fromcode, tocode);
return processors.insert(make_pair(encoding, move(p))).first->second;
- } else
- return it->second;
+ }
+ return it->second;
}
} // namespace