Skip to content

Commit

Permalink
submission: Rename struct submission_recipient *rcpt variables to *sr…
Browse files Browse the repository at this point in the history 
…cpt.
  • Loading branch information
@stephanbosch @villesavolainen
stephanbosch authored and villesavolainen committed Feb 12, 2019
1 parent 201fe17 commit 7d88326
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion src/submission/submission-client.h
View file
Expand Up @@ -37,7 +37,7 @@ struct submission_client_vfuncs {
int (*cmd_mail)(struct client *client, struct smtp_server_cmd_ctx *cmd,
struct smtp_server_cmd_mail *data);
int (*cmd_rcpt)(struct client *client,
struct submission_recipient *rcpt,
struct submission_recipient *srcpt,
struct smtp_server_cmd_ctx *cmd,
struct smtp_server_cmd_rcpt *data);
int (*cmd_rset)(struct client *client, struct smtp_server_cmd_ctx *cmd);
Expand Down
24 changes: 12 additions & 12 deletions src/submission/submission-commands.c
View file
Expand Up @@ -146,9 +146,9 @@ int client_default_cmd_mail(struct client *client,

static void
cmd_rcpt_destroy(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
struct submission_recipient *rcpt)
struct submission_recipient *srcpt)
{
submission_recipient_destroy(&rcpt);
submission_recipient_destroy(&srcpt);
}

static void
Expand All @@ -157,44 +157,44 @@ submission_rcpt_finished(struct smtp_server_cmd_ctx *cmd,
struct smtp_server_recipient *trcpt,
unsigned int index)
{
struct submission_recipient *rcpt = trcpt->context;
struct submission_recipient *srcpt = trcpt->context;

smtp_server_command_remove_hook(cmd->cmd,
SMTP_SERVER_COMMAND_HOOK_DESTROY,
cmd_rcpt_destroy);

submission_recipient_finished(rcpt, trcpt, index);
submission_recipient_finished(srcpt, trcpt, index);
}

int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
struct smtp_server_cmd_rcpt *data)
{
struct client *client = conn_ctx;
struct submission_recipient *rcpt;
struct submission_recipient *srcpt;

rcpt = submission_recipient_create(client, data->path);
srcpt = submission_recipient_create(client, data->path);

smtp_server_command_add_hook(cmd->cmd, SMTP_SERVER_COMMAND_HOOK_DESTROY,
cmd_rcpt_destroy, rcpt);
cmd_rcpt_destroy, srcpt);

data->trans_context = rcpt;
data->trans_context = srcpt;
data->hook_finished = submission_rcpt_finished;

return client->v.cmd_rcpt(client, rcpt, cmd, data);
return client->v.cmd_rcpt(client, srcpt, cmd, data);
}

int client_default_cmd_rcpt(struct client *client ATTR_UNUSED,
struct submission_recipient *rcpt,
struct submission_recipient *srcpt,
struct smtp_server_cmd_ctx *cmd,
struct smtp_server_cmd_rcpt *data)
{
struct smtp_server_transaction *trans;

trans = smtp_server_connection_get_transaction(cmd->conn);
if (trans != NULL)
submission_backend_trans_start(rcpt->backend, trans);
submission_backend_trans_start(srcpt->backend, trans);

return submission_backend_cmd_rcpt(rcpt->backend, cmd, data);
return submission_backend_cmd_rcpt(srcpt->backend, cmd, data);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion src/submission/submission-commands.h
View file
Expand Up @@ -34,7 +34,7 @@ int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
struct smtp_server_cmd_rcpt *data);

int client_default_cmd_rcpt(struct client *client ATTR_UNUSED,
struct submission_recipient *rcpt,
struct submission_recipient *srcpt,
struct smtp_server_cmd_ctx *cmd,
struct smtp_server_cmd_rcpt *data);

Expand Down
32 changes: 16 additions & 16 deletions src/submission/submission-recipient.c
View file
Expand Up @@ -11,42 +11,42 @@ submission_recipient_module_register = { 0 };
struct submission_recipient *
submission_recipient_create(struct client *client, struct smtp_address *path)
{
struct submission_recipient *rcpt;
struct submission_recipient *srcpt;
pool_t pool;

pool = pool_alloconly_create("submission recipient", 512);
rcpt = p_new(pool, struct submission_recipient, 1);
rcpt->pool = pool;
rcpt->backend = client->state.backend;
rcpt->path = path;
srcpt = p_new(pool, struct submission_recipient, 1);
srcpt->pool = pool;
srcpt->backend = client->state.backend;
srcpt->path = path;

p_array_init(&rcpt->module_contexts, rcpt->pool, 5);
p_array_init(&srcpt->module_contexts, srcpt->pool, 5);

return rcpt;
return srcpt;
}

void submission_recipient_destroy(struct submission_recipient **_rcpt)
void submission_recipient_destroy(struct submission_recipient **_srcpt)
{
struct submission_recipient *rcpt = *_rcpt;
struct submission_recipient *srcpt = *_srcpt;

*_rcpt = NULL;
*_srcpt = NULL;

pool_unref(&rcpt->pool);
pool_unref(&srcpt->pool);
}

void submission_recipient_finished(struct submission_recipient *rcpt,
void submission_recipient_finished(struct submission_recipient *srcpt,
struct smtp_server_recipient *trcpt,
unsigned int index)
{
struct submission_backend *backend = rcpt->backend;
struct submission_backend *backend = srcpt->backend;
struct client *client = backend->client;
struct submission_backend *const *bknd_idx;
bool backend_found = FALSE;

rcpt->path = trcpt->path;
rcpt->index = index;
srcpt->path = trcpt->path;
srcpt->index = index;

array_append(&client->rcpt_to, &rcpt, 1);
array_append(&client->rcpt_to, &srcpt, 1);

array_foreach(&client->rcpt_backends, bknd_idx) {
if (*bknd_idx == backend) {
Expand Down
4 changes: 2 additions & 2 deletions src/submission/submission-recipient.h
View file
Expand Up @@ -28,8 +28,8 @@ submission_recipient_module_register;

struct submission_recipient *
submission_recipient_create(struct client *client, struct smtp_address *path);
void submission_recipient_destroy(struct submission_recipient **_rcpt);
void submission_recipient_finished(struct submission_recipient *rcpt,
void submission_recipient_destroy(struct submission_recipient **_srcpt);
void submission_recipient_finished(struct submission_recipient *srcpt,
struct smtp_server_recipient *trcpt,
unsigned int index);

Expand Down

0 comments on commit 7d88326

Please sign in to comment.