diff options
Diffstat (limited to 'libproto')
| -rw-r--r-- | libproto/imap/folder.c | 4 | ||||
| -rw-r--r-- | libproto/imap/genlist.c | 12 | ||||
| -rw-r--r-- | libproto/imap/tests/imapfolder.c | 2 | ||||
| -rw-r--r-- | libproto/nntp/folder.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libproto/imap/folder.c b/libproto/imap/folder.c index 5e4331292..9e23847b8 100644 --- a/libproto/imap/folder.c +++ b/libproto/imap/folder.c @@ -269,13 +269,13 @@ _mu_imap_folder_list (mu_folder_t folder, struct mu_folder_scanner *scn) mu_list_t list; int rc = mu_imap_list_new (imap, scn->refname, scn->pattern, &list); if (rc) return rc; - if (scn->max_level + if (scn->max_depth || (scn->match_flags & MU_FOLDER_ATTRIBUTE_ALL) != MU_FOLDER_ATTRIBUTE_ALL) { /* Filter out the list, eliminating non-matching entries */ mu_iterator_t itr; rc = mu_list_get_iterator (list, &itr); @@ -289,13 +289,13 @@ _mu_imap_folder_list (mu_folder_t folder, struct mu_folder_scanner *scn) mu_iterator_next (itr)) { struct mu_list_response *rp; mu_iterator_current (itr, (void**) &rp); if (!(rp->type & scn->match_flags) - || (scn->max_level && rp->level > scn->max_level)) + || (scn->max_depth && rp->depth > scn->max_depth)) mu_iterator_ctl (itr, mu_itrctl_delete, NULL); } mu_iterator_destroy (&itr); } if (scn->enumfun) diff --git a/libproto/imap/genlist.c b/libproto/imap/genlist.c index 1e2de88d8..13352b6bb 100644 --- a/libproto/imap/genlist.c +++ b/libproto/imap/genlist.c @@ -34,20 +34,20 @@ struct list_closure int error_code; mu_list_t retlist; const char *command; }; static int -count_level (const char *name, int delim) +count_depth (const char *name, int delim) { - int level = 0; + int depth = 0; while (*name) if (*name++ == delim) - level++; - return level; + depth++; + return depth; } static int list_attr_conv (void *item, void *data) { struct imap_list_element *elt = item; @@ -106,20 +106,20 @@ list_untagged_handler (mu_imap_t imap, mu_list_t resp, void *data) elt = _mu_imap_list_at (resp, 2); if (!elt) return; if (_mu_imap_list_element_is_nil (elt)) { rp->separator = 0; - rp->level = 0; + rp->depth = 0; } else if (elt->type != imap_eltype_string) return; else { rp->separator = elt->v.string[0]; - rp->level = count_level (rp->name, rp->separator); + rp->depth = count_depth (rp->name, rp->separator); } if ((clos->error_code = mu_list_append (clos->retlist, rp))) mu_list_response_free (rp); } } diff --git a/libproto/imap/tests/imapfolder.c b/libproto/imap/tests/imapfolder.c index 8d3f6ce44..2de850622 100644 --- a/libproto/imap/tests/imapfolder.c +++ b/libproto/imap/tests/imapfolder.c @@ -34,13 +34,13 @@ _print_list_entry (void *item, void *data) { struct mu_list_response *resp = item; mu_printf ("%c%c %c %4d %s\n", (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-', (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-', resp->separator ? resp->separator : ' ', - resp->level, + resp->depth, resp->name); return 0; } static void com_list (mu_folder_t folder, char **argv) diff --git a/libproto/nntp/folder.c b/libproto/nntp/folder.c index bdc16f557..8919a03cd 100644 --- a/libproto/nntp/folder.c +++ b/libproto/nntp/folder.c @@ -186,13 +186,13 @@ nntp_folder_destroy (mu_folder_t folder) } } static int nntp_folder_list (mu_folder_t folder, const char *ref, void *pat, int flags, - size_t max_level, mu_list_t flist, + size_t max_depth, mu_list_t flist, mu_folder_enumerate_fp efp, void *edp) { return ENOTSUP; } #else #include <stdio.h> |