New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Iconv: Change convert() return type to const std::string& #1099

Merged

ma8ma merged 1 commit into master from iconv-change-convert-function-return-type

Feb 4, 2023

Collaborator

ma8ma commented Feb 4, 2023

JDLIB::Iconvクラスで使うバッファをstd::vector<char>からstd::stringに変更します。
convert()の引数と戻り値を整理して内部バッファのconst参照を直接返すように修正します。
合わせてconvert()を呼び出すコードを整理します。


          Iconv: Change convert() return type to const std::string&

eacdfec

`JDLIB::Iconv`クラスで使うバッファを`std::vector<char>`から
`std::string`に変更します。`convert()`の引数と戻り値を整理して
内部バッファのconst参照を直接返すように修正します。合わせて
`convert()`を呼び出すコードを整理します。

ma8ma added the refactoring label

ma8ma commented

View reviewed changes

src/dbtree/nodetree2chcompati.cpp

-                  return  m_iconv->convert( rawlines, strlen( rawlines ), byte );
+                  const std::string& result = m_iconv->convert( rawlines, std::strlen( rawlines ) );
+                  byte = result.size();
+                  return result.c_str();

Collaborator Author

ma8ma Feb 4, 2023

修正メモ
ポインターを取り出して関数から返しているので寿命管理に不安、raw2dat()の引数と戻り値を整理する

ma8ma merged commit b0d746c into master

ma8ma deleted the iconv-change-convert-function-return-type branch

February 4, 2023 12:45

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment