alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

option: rename to to_string_opt and to_string_view_opt

Browse Source 
to_option_string -> to_string_opt
to_string_view   -> to_string_view_opt
This commit is contained in:
Dirk-Jan C. Binnema
2022-04-16 13:16:29 +03:00
parent 4f9c154d1a
commit 7c51bc68d4
9 changed files with 104 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/message/mu-message.cc
View File

@ -89,8 +89,10 @@ Message::Message(const std::string& path, const std::string& mdir):
else
priv_->mime_msg = std::move(msg.value());
priv_->doc.add(Field::Id::Path,
Mu::from_gchars(g_canonicalize_filename(path.c_str(), NULL)));
auto xpath{to_string_opt_gchar(g_canonicalize_filename(path.c_str(), NULL))};
if (xpath)
priv_->doc.add(Field::Id::Path, std::move(xpath.value()));
if (!mdir.empty())
priv_->doc.add(Field::Id::Maildir, mdir);
priv_->doc.add(Field::Id::Size, static_cast<int64_t>(statbuf.st_size));
@ -103,10 +105,10 @@ Message::Message(const std::string& text, const std::string& path,
const std::string& mdir):
priv_{std::make_unique<Private>()}
{
if (!path.empty())
priv_->doc.add(Field::Id::Path,
Mu::from_gchars(
g_canonicalize_filename(path.c_str(), NULL)));
auto xpath{to_string_opt_gchar(g_canonicalize_filename(path.c_str(), NULL))};
if (xpath)
priv_->doc.add(Field::Id::Path, std::move(xpath.value()));
if (!mdir.empty())
priv_->doc.add(Field::Id::Maildir, mdir);
@ -246,7 +248,7 @@ get_mailing_list(const MimeMessage& mime_msg)
g_free(dechdr);
return from_gchars(std::move(res));
return to_string_opt_gchar(std::move(res));
}
static bool /* heuristic */