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

clang-format: update c/cc coding style

Browse Source 
Update all cc code using .clang-format; please do so as well for future PRs
etc.; emacs has a handy 'clang-format' mode to make this automatic.

For comparing old changes with git blame, we can disregard this one using
--ignore-rev

(see https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame )
This commit is contained in:
Dirk-Jan C. Binnema
2021-10-20 12:18:15 +03:00
parent 09935cc4b3
commit 3dd721d5a3
111 changed files with 13851 additions and 14579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/mu-msg-doc.cc
View File

@ -34,39 +34,37 @@
using namespace Mu;
struct Mu::MuMsgDoc {
MuMsgDoc (Xapian::Document *doc): _doc (doc) { }
~MuMsgDoc () { delete _doc; }
MuMsgDoc(Xapian::Document* doc) : _doc(doc) {}
~MuMsgDoc() { delete _doc; }
const Xapian::Document doc() const { return *_doc; }
private:
Xapian::Document *_doc;
private:
Xapian::Document* _doc;
};
MuMsgDoc*
Mu::mu_msg_doc_new (XapianDocument *doc, GError **err)
Mu::mu_msg_doc_new(XapianDocument* doc, GError** err)
{
g_return_val_if_fail (doc, NULL);
MuMsgDoc *mdoc = xapian_try([&]{
return new MuMsgDoc ((Xapian::Document*)doc);
}, (MuMsgDoc*)nullptr);
g_return_val_if_fail(doc, NULL);
MuMsgDoc* mdoc =
xapian_try([&] { return new MuMsgDoc((Xapian::Document*)doc); }, (MuMsgDoc*)nullptr);
if (!mdoc)
mu_util_g_set_error (err, MU_ERROR_INTERNAL,
"failed to create message doc");
mu_util_g_set_error(err, MU_ERROR_INTERNAL, "failed to create message doc");
return mdoc;
}
void
Mu::mu_msg_doc_destroy (MuMsgDoc *self)
Mu::mu_msg_doc_destroy(MuMsgDoc* self)
{
xapian_try([&]{delete self;});
xapian_try([&] { delete self; });
}
gchar*
Mu::mu_msg_doc_get_str_field (MuMsgDoc *self, MuMsgFieldId mfid)
Mu::mu_msg_doc_get_str_field(MuMsgDoc* self, MuMsgFieldId mfid)
{
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (mu_msg_field_id_is_valid(mfid), NULL);
g_return_val_if_fail(self, NULL);
g_return_val_if_fail(mu_msg_field_id_is_valid(mfid), NULL);
// disable this check:
// g_return_val_if_fail (mu_msg_field_is_string(mfid), NULL);
@ -75,44 +73,47 @@ Mu::mu_msg_doc_get_str_field (MuMsgDoc *self, MuMsgFieldId mfid)
// have to convert to numbers first, esp. when it's a date
// time_t)
return xapian_try([&]{
const std::string s (self->doc().get_value(mfid));
return s.empty() ? NULL : g_strdup (s.c_str());
},(gchar*)nullptr);
return xapian_try(
[&] {
const std::string s(self->doc().get_value(mfid));
return s.empty() ? NULL : g_strdup(s.c_str());
},
(gchar*)nullptr);
}
GSList*
Mu::mu_msg_doc_get_str_list_field (MuMsgDoc *self, MuMsgFieldId mfid)
Mu::mu_msg_doc_get_str_list_field(MuMsgDoc* self, MuMsgFieldId mfid)
{
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (mu_msg_field_id_is_valid(mfid), NULL);
g_return_val_if_fail (mu_msg_field_is_string_list(mfid), NULL);
g_return_val_if_fail(self, NULL);
g_return_val_if_fail(mu_msg_field_id_is_valid(mfid), NULL);
g_return_val_if_fail(mu_msg_field_is_string_list(mfid), NULL);
return xapian_try([&]{
/* return a comma-separated string as a GSList */
const std::string s (self->doc().get_value(mfid));
return s.empty() ? NULL : mu_str_to_list(s.c_str(),',',TRUE);
},(GSList*)nullptr);
return xapian_try(
[&] {
/* return a comma-separated string as a GSList */
const std::string s(self->doc().get_value(mfid));
return s.empty() ? NULL : mu_str_to_list(s.c_str(), ',', TRUE);
},
(GSList*)nullptr);
}
gint64
Mu::mu_msg_doc_get_num_field (MuMsgDoc *self, MuMsgFieldId mfid)
Mu::mu_msg_doc_get_num_field(MuMsgDoc* self, MuMsgFieldId mfid)
{
g_return_val_if_fail (self, -1);
g_return_val_if_fail (mu_msg_field_id_is_valid(mfid), -1);
g_return_val_if_fail (mu_msg_field_is_numeric(mfid), -1);
g_return_val_if_fail(self, -1);
g_return_val_if_fail(mu_msg_field_id_is_valid(mfid), -1);
g_return_val_if_fail(mu_msg_field_is_numeric(mfid), -1);
return xapian_try([&]{
const std::string s (self->doc().get_value(mfid));
if (s.empty())
return (gint64)0;
else if (mfid == MU_MSG_FIELD_ID_DATE ||
mfid == MU_MSG_FIELD_ID_SIZE)
return static_cast<gint64>(strtol (s.c_str(), NULL, 10));
else {
return static_cast<gint64>
(Xapian::sortable_unserialise(s));
}
}, (gint64)-1);
return xapian_try(
[&] {
const std::string s(self->doc().get_value(mfid));
if (s.empty())
return (gint64)0;
else if (mfid == MU_MSG_FIELD_ID_DATE || mfid == MU_MSG_FIELD_ID_SIZE)
return static_cast<gint64>(strtol(s.c_str(), NULL, 10));
else {
return static_cast<gint64>(Xapian::sortable_unserialise(s));
}
},
(gint64)-1);
}