Skip to content

Commit

Permalink
Merge pull request #5026 from dilyanpalauzov/mboxevent_extract_quota_…
Browse files Browse the repository at this point in the history
…tautology

mboxevent_extract_quota() tautology
  • Loading branch information
ksmurchison authored Sep 19, 2024
2 parents 0205bb1 + ad89525 commit 25234a9
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions imap/mboxevent.c
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ EXPORTED void mboxevent_set_access(struct mboxevent *event,
return;
}

/* all events needs uri parameter */
/* all events need uri parameter */
memset(&imapurl, 0, sizeof(struct imapurl));
imapurl.server = config_servername;

Expand Down Expand Up @@ -1593,12 +1593,9 @@ void mboxevent_extract_quota(struct mboxevent *event, const struct quota *quota,
char *extname = mboxname_to_external(quota->root, &namespace, NULL);
imapurl.mailbox = extname;

if (!event->params[EVENT_URI].filled) {
struct buf url = BUF_INITIALIZER;
imapurl_toURL(&url, &imapurl);
FILL_STRING_PARAM(event, EVENT_URI, buf_release(&url));
}

struct buf url = BUF_INITIALIZER;
imapurl_toURL(&url, &imapurl);
FILL_STRING_PARAM(event, EVENT_URI, buf_release(&url));
xzfree(extname);

/* Note that userbuf for shared folders is NULL, and xstrdup
Expand Down Expand Up @@ -1699,7 +1696,7 @@ EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event,
event->uidset = NULL;
}

/* all events needs uri parameter */
/* all events need uri parameter */
struct buf url = BUF_INITIALIZER;
imapurl_toURL(&url, &imapurl);
FILL_STRING_PARAM(event, EVENT_URI, buf_release(&url));
Expand Down

0 comments on commit 25234a9

Please sign in to comment.