Skip to content

Commit

Permalink
lib-storage: Renamed duplicate to mail_duplicate.
Browse files Browse the repository at this point in the history
This makes more sense given where this is now located.
  • Loading branch information
stephanbosch authored and Timo Sirainen committed Oct 4, 2017
1 parent 06426c2 commit f41f629
Show file tree
Hide file tree
Showing 6 changed files with 117 additions and 108 deletions.
9 changes: 6 additions & 3 deletions src/lib-lda/mail-deliver.c
Expand Up @@ -13,9 +13,11 @@
#include "mail-storage.h"
#include "mail-namespace.h"
#include "mail-storage-private.h"
#include "duplicate.h"
#include "mail-duplicate.h"
#include "mail-deliver.h"

#define DUPLICATE_DB_NAME "lda-dupes"

#define MAIL_DELIVER_USER_CONTEXT(obj) \
MODULE_CONTEXT(obj, mail_deliver_user_module)
#define MAIL_DELIVER_STORAGE_CONTEXT(obj) \
Expand Down Expand Up @@ -445,7 +447,8 @@ int mail_deliver(struct mail_deliver_context *ctx,
if (deliver_mail == NULL)
ret = -1;
else {
ctx->dup_ctx = duplicate_init(ctx->dest_user);
ctx->dup_db = mail_duplicate_db_init(ctx->dest_user,
DUPLICATE_DB_NAME);
if (deliver_mail(ctx, storage_r) <= 0) {
/* if message was saved, don't bounce it even though
the script failed later. */
Expand All @@ -454,7 +457,7 @@ int mail_deliver(struct mail_deliver_context *ctx,
/* success. message may or may not have been saved. */
ret = 0;
}
duplicate_deinit(&ctx->dup_ctx);
mail_duplicate_db_deinit(&ctx->dup_db);
if (ret < 0 && mail_deliver_is_tempfailed(ctx, *storage_r)) {
muser->deliver_ctx = NULL;
return -1;
Expand Down
2 changes: 1 addition & 1 deletion src/lib-lda/mail-deliver.h
Expand Up @@ -32,7 +32,7 @@ struct mail_deliver_context {
unsigned int session_time_msecs;
struct timeval delivery_time_started;

struct duplicate_context *dup_ctx;
struct mail_duplicate_db *dup_db;

/* Session ID, used as log line prefix if non-NULL. */
const char *session_id;
Expand Down
4 changes: 2 additions & 2 deletions src/lib-storage/Makefile.am
Expand Up @@ -20,13 +20,13 @@ AM_CPPFLAGS = \
-DMODULEDIR=\""$(moduledir)"\"

libstorage_la_SOURCES = \
duplicate.c \
fail-mail-storage.c \
fail-mailbox.c \
fail-mail.c \
mail.c \
mail-autoexpunge.c \
mail-copy.c \
mail-duplicate.c \
mail-error.c \
mail-namespace.c \
mail-search.c \
Expand Down Expand Up @@ -66,10 +66,10 @@ libstorage_la_SOURCES = \
mailbox-watch.c

headers = \
duplicate.h \
fail-mail-storage.h \
mail-autoexpunge.h \
mail-copy.h \
mail-duplicate.h \
mail-error.h \
mail-namespace.h \
mail-search.h \
Expand Down
20 changes: 0 additions & 20 deletions src/lib-storage/duplicate.h

This file was deleted.

0 comments on commit f41f629

Please sign in to comment.