dovecot-2.2: lib-storage: Made mail_search_arg_[one_]equals() pu...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Dec 6 16:10:38 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/91509e171e4b
changeset: 19471:91509e171e4b
user: Timo Sirainen <tss at iki.fi>
date: Sun Dec 06 18:09:17 2015 +0200
description:
lib-storage: Made mail_search_arg_[one_]equals() public.
diffstat:
src/lib-storage/mail-search.c | 11 ++++-------
src/lib-storage/mail-search.h | 9 +++++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diffs (61 lines):
diff -r 95d355376204 -r 91509e171e4b src/lib-storage/mail-search.c
--- a/src/lib-storage/mail-search.c Sun Dec 06 18:08:20 2015 +0200
+++ b/src/lib-storage/mail-search.c Sun Dec 06 18:09:17 2015 +0200
@@ -9,9 +9,6 @@
#include "mail-search-build.h"
#include "mail-search.h"
-static bool mail_search_arg_equals(const struct mail_search_arg *arg1,
- const struct mail_search_arg *arg2);
-
static void
mailbox_uidset_change(struct mail_search_arg *arg, struct mailbox *box,
const ARRAY_TYPE(seq_range) *search_saved_uidset)
@@ -583,8 +580,8 @@
return TRUE;
}
-static bool mail_search_arg_one_equals(const struct mail_search_arg *arg1,
- const struct mail_search_arg *arg2)
+bool mail_search_arg_one_equals(const struct mail_search_arg *arg1,
+ const struct mail_search_arg *arg2)
{
if (arg1->type != arg2->type ||
arg1->match_not != arg2->match_not ||
@@ -659,8 +656,8 @@
return FALSE;
}
-static bool mail_search_arg_equals(const struct mail_search_arg *arg1,
- const struct mail_search_arg *arg2)
+bool mail_search_arg_equals(const struct mail_search_arg *arg1,
+ const struct mail_search_arg *arg2)
{
while (arg1 != NULL && arg2 != NULL) {
if (!mail_search_arg_one_equals(arg1, arg2))
diff -r 95d355376204 -r 91509e171e4b src/lib-storage/mail-search.h
--- a/src/lib-storage/mail-search.h Sun Dec 06 18:08:20 2015 +0200
+++ b/src/lib-storage/mail-search.h Sun Dec 06 18:09:17 2015 +0200
@@ -70,6 +70,8 @@
};
struct mail_search_arg {
+ /* NOTE: when adding new fields, make sure mail_search_arg_dup_one()
+ and mail_search_arg_one_equals() are updated. */
struct mail_search_arg *next;
enum mail_search_arg_type type;
@@ -154,6 +156,13 @@
messages depending on when the search is run. */
bool mail_search_args_equal(const struct mail_search_args *args1,
const struct mail_search_args *args2);
+/* Same as mail_search_args_equal(), but for individual mail_search_arg
+ structs. All the siblings of arg1 and arg2 are also compared. */
+bool mail_search_arg_equals(const struct mail_search_arg *arg1,
+ const struct mail_search_arg *arg2);
+/* Same as mail_search_arg_equals(), but don't compare siblings. */
+bool mail_search_arg_one_equals(const struct mail_search_arg *arg1,
+ const struct mail_search_arg *arg2);
void mail_search_args_ref(struct mail_search_args *args);
void mail_search_args_unref(struct mail_search_args **args);
More information about the dovecot-cvs
mailing list