Amend efc0877f

[features.git] / src / support / unicode.cpp

diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp
index d79e02c41ead13cd0b4b6444a56ddb4232a09341..d84d81ac3dcde6a0f4fcdb614715dc7fa229a47d 100644 (file)
--- a/src/support/unicode.cpp
+++ b/src/support/unicode.cpp
@@ -107,7 +107,7 @@ int IconvProcessor::convert(char const * buf, size_t buflen,
        // 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;
@@ -252,8 +252,8 @@ IconvProcessor & getProc(map<string, IconvProcessor> & processors,
        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