From: Richard Russon Date: Fri, 8 Feb 2019 19:25:29 +0000 (+0000) Subject: rename pop_adata_get X-Git-Tag: 2019-10-25~372^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62d8b4dee308931adbca520bce31aad6675994d1;p=neomutt rename pop_adata_get --- diff --git a/pop/pop.c b/pop/pop.c index bce26a1f3..d186ff5ae 100644 --- a/pop/pop.c +++ b/pop/pop.c @@ -261,7 +261,7 @@ static int pop_read_header(struct PopAccountData *adata, struct Email *e) static int fetch_uidl(char *line, void *data) { struct Mailbox *m = data; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); char *endp = NULL; errno = 0; @@ -315,7 +315,7 @@ static int msg_cache_check(const char *id, struct BodyCache *bcache, void *data) if (!m) return -1; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); if (!adata) return -1; @@ -382,7 +382,7 @@ static int pop_fetch_headers(struct Mailbox *m) if (!m) return -1; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); struct Progress progress; #ifdef USE_HCACHE @@ -897,7 +897,7 @@ static int pop_mbox_check(struct Mailbox *m, int *index_hint) if (!m) return -1; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); if ((adata->check_time + PopCheckinterval) > time(NULL)) return 0; @@ -940,7 +940,7 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint) int i, j, ret = 0; char buf[LONG_STRING]; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); struct Progress progress; #ifdef USE_HCACHE header_cache_t *hc = NULL; @@ -1028,7 +1028,7 @@ static int pop_mbox_close(struct Mailbox *m) if (!m) return -1; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); if (!adata) return 0; @@ -1061,7 +1061,7 @@ static int pop_msg_open(struct Mailbox *m, struct Message *msg, int msgno) char buf[LONG_STRING]; char path[PATH_MAX]; struct Progress progressbar; - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); struct Email *e = m->emails[msgno]; struct PopEmailData *edata = e->edata; bool bcache = true; @@ -1220,7 +1220,7 @@ static int pop_msg_save_hcache(struct Mailbox *m, struct Email *e) { int rc = 0; #ifdef USE_HCACHE - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); struct PopEmailData *edata = e->edata; header_cache_t *hc = pop_hcache_open(adata, m->path); rc = mutt_hcache_store(hc, edata->uid, strlen(edata->uid), e, 0); diff --git a/pop/pop_lib.c b/pop/pop_lib.c index 15eb19e5a..ff07d33dd 100644 --- a/pop/pop_lib.c +++ b/pop/pop_lib.c @@ -406,7 +406,7 @@ err_conn: */ void pop_logout(struct Mailbox *m) { - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); if (adata->status == POP_CONNECTED) { @@ -593,7 +593,7 @@ static int check_uidl(char *line, void *data) */ int pop_reconnect(struct Mailbox *m) { - struct PopAccountData *adata = pop_get_adata(m); + struct PopAccountData *adata = pop_adata_get(m); if (adata->status == POP_CONNECTED) return 0; @@ -635,11 +635,11 @@ int pop_reconnect(struct Mailbox *m) } /** - * pop_get_adata - Get the Account data for this mailbox + * pop_adata_get - Get the Account data for this mailbox * @param m Mailbox * @retval ptr PopAccountData */ -struct PopAccountData *pop_get_adata(struct Mailbox *m) +struct PopAccountData *pop_adata_get(struct Mailbox *m) { if (!m || (m->magic != MUTT_POP)) return NULL; diff --git a/pop/pop_private.h b/pop/pop_private.h index 1bd5b4b39..9279986dd 100644 --- a/pop/pop_private.h +++ b/pop/pop_private.h @@ -134,6 +134,6 @@ int pop_fetch_data(struct PopAccountData *adata, const char *query, struct Progr int (*func)(char *, void *), void *data); int pop_reconnect(struct Mailbox *m); void pop_logout(struct Mailbox *m); -struct PopAccountData *pop_get_adata(struct Mailbox *m); +struct PopAccountData *pop_adata_get(struct Mailbox *m); #endif /* MUTT_POP_POP_PRIVATE_H */