diff options
-rw-r--r-- | examples/lsf.c | 2 | ||||
-rw-r--r-- | include/mailutils/cpp/folder.h | 4 | ||||
-rw-r--r-- | include/mailutils/folder.h | 9 | ||||
-rw-r--r-- | libmailutils/mailbox/folder.c | 8 | ||||
-rw-r--r-- | libmailutils/mailbox/fsfolder.c | 12 | ||||
-rw-r--r-- | libmailutils/tests/fsfolder.c | 8 | ||||
-rw-r--r-- | libmu_cpp/folder.cc | 8 | ||||
-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 | ||||
-rw-r--r-- | mu/libexec/imap.c | 2 | ||||
-rw-r--r-- | python/2/libmu_py/folder.c | 8 | ||||
-rw-r--r-- | python/2/mailutils/folder.py | 4 | ||||
-rw-r--r-- | python/3/libmu_py/folder.c | 10 | ||||
-rw-r--r-- | python/3/mailutils/folder.py | 4 |
16 files changed, 50 insertions, 49 deletions
diff --git a/examples/lsf.c b/examples/lsf.c index cba79d30c..c38689352 100644 --- a/examples/lsf.c +++ b/examples/lsf.c | |||
@@ -31,3 +31,3 @@ enumfun (mu_folder_t folder, struct mu_list_response *resp, void *data) | |||
31 | resp->separator, | 31 | resp->separator, |
32 | resp->level, | 32 | resp->depth, |
33 | resp->name); | 33 | resp->name); |
diff --git a/include/mailutils/cpp/folder.h b/include/mailutils/cpp/folder.h index fe4ed77c5..97c6d0fd4 100644 --- a/include/mailutils/cpp/folder.h +++ b/include/mailutils/cpp/folder.h | |||
@@ -45,5 +45,5 @@ class Folder | |||
45 | 45 | ||
46 | List& list (const std::string& dirname, void* pattern, size_t max_level); | 46 | List& list (const std::string& dirname, void* pattern, size_t max_depth); |
47 | List& enumerate (const std::string& name, void* pattern, | 47 | List& enumerate (const std::string& name, void* pattern, |
48 | int flags, size_t max_level, | 48 | int flags, size_t max_depth, |
49 | mu_folder_enumerate_fp enumfun, void* enumdata); | 49 | mu_folder_enumerate_fp enumfun, void* enumdata); |
diff --git a/include/mailutils/folder.h b/include/mailutils/folder.h index 4ca4b92ee..ceb54dd62 100644 --- a/include/mailutils/folder.h +++ b/include/mailutils/folder.h | |||
@@ -29,5 +29,5 @@ struct mu_list_response | |||
29 | int type; /* MU_FOLDER_ATTRIBUTE_.* flags */ | 29 | int type; /* MU_FOLDER_ATTRIBUTE_.* flags */ |
30 | int level; | 30 | int depth; /* Item depth within the hierarchy */ |
31 | int separator; | 31 | int separator; /* Directory separator character */ |
32 | char *name; | 32 | char *name; /* Item name */ |
33 | mu_record_t format; /* Associated mailbox format record */ | 33 | mu_record_t format; /* Associated mailbox format record */ |
@@ -68,3 +68,4 @@ struct mu_folder_scanner | |||
68 | int match_flags; /* Matching flags */ | 68 | int match_flags; /* Matching flags */ |
69 | size_t max_level; /* Max. nesting level to descend */ | 69 | size_t max_depth; /* Max. depth to descend |
70 | (1-based, 0 means 'unlimited') */ | ||
70 | mu_folder_enumerate_fp enumfun; /* Enumeration function */ | 71 | mu_folder_enumerate_fp enumfun; /* Enumeration function */ |
diff --git a/libmailutils/mailbox/folder.c b/libmailutils/mailbox/folder.c index 8a474c8f6..d22bb3315 100644 --- a/libmailutils/mailbox/folder.c +++ b/libmailutils/mailbox/folder.c | |||
@@ -358,3 +358,3 @@ int | |||
358 | mu_folder_list (mu_folder_t folder, const char *dirname, void *pattern, | 358 | mu_folder_list (mu_folder_t folder, const char *dirname, void *pattern, |
359 | size_t max_level, | 359 | size_t max_depth, |
360 | mu_list_t *pflist) | 360 | mu_list_t *pflist) |
@@ -362,3 +362,3 @@ mu_folder_list (mu_folder_t folder, const char *dirname, void *pattern, | |||
362 | return mu_folder_enumerate (folder, dirname, pattern, | 362 | return mu_folder_enumerate (folder, dirname, pattern, |
363 | MU_FOLDER_ATTRIBUTE_ALL, max_level, | 363 | MU_FOLDER_ATTRIBUTE_ALL, max_depth, |
364 | pflist, NULL, NULL); | 364 | pflist, NULL, NULL); |
@@ -369,3 +369,3 @@ mu_folder_enumerate (mu_folder_t folder, const char *name, | |||
369 | void *pattern, int flags, | 369 | void *pattern, int flags, |
370 | size_t max_level, | 370 | size_t max_depth, |
371 | mu_list_t *pflist, | 371 | mu_list_t *pflist, |
@@ -385,3 +385,3 @@ mu_folder_enumerate (mu_folder_t folder, const char *name, | |||
385 | scn.match_flags = flags; | 385 | scn.match_flags = flags; |
386 | scn.max_level = max_level; | 386 | scn.max_depth = max_depth; |
387 | scn.enumfun = enumfun; | 387 | scn.enumfun = enumfun; |
diff --git a/libmailutils/mailbox/fsfolder.c b/libmailutils/mailbox/fsfolder.c index 553c9fddf..4afdbd6e9 100644 --- a/libmailutils/mailbox/fsfolder.c +++ b/libmailutils/mailbox/fsfolder.c | |||
@@ -296,3 +296,3 @@ list_helper (struct mu_folder_scanner *scn, | |||
296 | struct inode_list *ilist, | 296 | struct inode_list *ilist, |
297 | const char *dirname, size_t level) | 297 | const char *dirname, size_t depth) |
298 | { | 298 | { |
@@ -302,3 +302,3 @@ list_helper (struct mu_folder_scanner *scn, | |||
302 | 302 | ||
303 | if (scn->max_level && level >= scn->max_level) | 303 | if (scn->max_depth && depth >= scn->max_depth) |
304 | return 0; | 304 | return 0; |
@@ -379,3 +379,3 @@ list_helper (struct mu_folder_scanner *scn, | |||
379 | resp->name = fname; | 379 | resp->name = fname; |
380 | resp->level = level; | 380 | resp->depth = depth; |
381 | resp->separator = '/'; | 381 | resp->separator = '/'; |
@@ -423,3 +423,3 @@ list_helper (struct mu_folder_scanner *scn, | |||
423 | stop = list_helper (scn, data, &idata, refname, | 423 | stop = list_helper (scn, data, &idata, refname, |
424 | level + 1); | 424 | depth + 1); |
425 | } | 425 | } |
@@ -433,3 +433,3 @@ list_helper (struct mu_folder_scanner *scn, | |||
433 | idata.next = ilist; | 433 | idata.next = ilist; |
434 | stop = list_helper (scn, data, &idata, fname, level + 1); | 434 | stop = list_helper (scn, data, &idata, fname, depth + 1); |
435 | } | 435 | } |
@@ -510,3 +510,3 @@ _fsfolder_lsub (mu_folder_t folder, const char *ref, const char *name, | |||
510 | resp->type = MU_FOLDER_ATTRIBUTE_FILE; | 510 | resp->type = MU_FOLDER_ATTRIBUTE_FILE; |
511 | resp->level = 0; | 511 | resp->depth = 0; |
512 | resp->separator = '/'; | 512 | resp->separator = '/'; |
diff --git a/libmailutils/tests/fsfolder.c b/libmailutils/tests/fsfolder.c index 5a4d9df7d..e6c45b7f0 100644 --- a/libmailutils/tests/fsfolder.c +++ b/libmailutils/tests/fsfolder.c | |||
@@ -46,5 +46,5 @@ compare_response (void const *a, void const *b) | |||
46 | 46 | ||
47 | if (ra->level < rb->level) | 47 | if (ra->depth < rb->depth) |
48 | return -1; | 48 | return -1; |
49 | if (ra->level > rb->level) | 49 | if (ra->depth > rb->depth) |
50 | return 1; | 50 | return 1; |
@@ -62,3 +62,3 @@ _print_list_entry (void *item, void *data) | |||
62 | resp->separator ? resp->separator : ' ', | 62 | resp->separator ? resp->separator : ' ', |
63 | resp->level, | 63 | resp->depth, |
64 | resp->name + len); | 64 | resp->name + len); |
@@ -175,3 +175,3 @@ com_scan (int argc, char **argv, mu_assoc_t options, void *env) | |||
175 | errno = 0; | 175 | errno = 0; |
176 | scn.max_level = strtoul (s, &p, 10); | 176 | scn.max_depth = strtoul (s, &p, 10); |
177 | if (errno || *p) | 177 | if (errno || *p) |
diff --git a/libmu_cpp/folder.cc b/libmu_cpp/folder.cc index ebc7401f8..cf6857fbb 100644 --- a/libmu_cpp/folder.cc +++ b/libmu_cpp/folder.cc | |||
@@ -84,3 +84,3 @@ List& | |||
84 | Folder :: list (const std::string& dirname, void* pattern, | 84 | Folder :: list (const std::string& dirname, void* pattern, |
85 | size_t max_level = 0) | 85 | size_t max_depth = 0) |
86 | { | 86 | { |
@@ -89,3 +89,3 @@ Folder :: list (const std::string& dirname, void* pattern, | |||
89 | int status = mu_folder_list (folder, dirname.c_str (), pattern, | 89 | int status = mu_folder_list (folder, dirname.c_str (), pattern, |
90 | max_level, &c_list); | 90 | max_depth, &c_list); |
91 | if (status) | 91 | if (status) |
@@ -98,3 +98,3 @@ List& | |||
98 | Folder :: enumerate (const std::string& name, void* pattern, | 98 | Folder :: enumerate (const std::string& name, void* pattern, |
99 | int flags, size_t max_level, | 99 | int flags, size_t max_depth, |
100 | mu_folder_enumerate_fp enumfun, void* enumdata) | 100 | mu_folder_enumerate_fp enumfun, void* enumdata) |
@@ -104,3 +104,3 @@ Folder :: enumerate (const std::string& name, void* pattern, | |||
104 | int status = mu_folder_enumerate (folder, name.c_str (), pattern, | 104 | int status = mu_folder_enumerate (folder, name.c_str (), pattern, |
105 | flags, max_level, &c_list, | 105 | flags, max_depth, &c_list, |
106 | enumfun, enumdata); | 106 | enumfun, enumdata); |
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 | |||
@@ -274,3 +274,3 @@ _mu_imap_folder_list (mu_folder_t folder, struct mu_folder_scanner *scn) | |||
274 | 274 | ||
275 | if (scn->max_level | 275 | if (scn->max_depth |
276 | || (scn->match_flags & MU_FOLDER_ATTRIBUTE_ALL) != MU_FOLDER_ATTRIBUTE_ALL) | 276 | || (scn->match_flags & MU_FOLDER_ATTRIBUTE_ALL) != MU_FOLDER_ATTRIBUTE_ALL) |
@@ -294,3 +294,3 @@ _mu_imap_folder_list (mu_folder_t folder, struct mu_folder_scanner *scn) | |||
294 | if (!(rp->type & scn->match_flags) | 294 | if (!(rp->type & scn->match_flags) |
295 | || (scn->max_level && rp->level > scn->max_level)) | 295 | || (scn->max_depth && rp->depth > scn->max_depth)) |
296 | mu_iterator_ctl (itr, mu_itrctl_delete, NULL); | 296 | mu_iterator_ctl (itr, mu_itrctl_delete, NULL); |
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 | |||
@@ -39,5 +39,5 @@ struct list_closure | |||
39 | static int | 39 | static int |
40 | count_level (const char *name, int delim) | 40 | count_depth (const char *name, int delim) |
41 | { | 41 | { |
42 | int level = 0; | 42 | int depth = 0; |
43 | 43 | ||
@@ -45,4 +45,4 @@ count_level (const char *name, int delim) | |||
45 | if (*name++ == delim) | 45 | if (*name++ == delim) |
46 | level++; | 46 | depth++; |
47 | return level; | 47 | return depth; |
48 | } | 48 | } |
@@ -111,3 +111,3 @@ list_untagged_handler (mu_imap_t imap, mu_list_t resp, void *data) | |||
111 | rp->separator = 0; | 111 | rp->separator = 0; |
112 | rp->level = 0; | 112 | rp->depth = 0; |
113 | } | 113 | } |
@@ -118,3 +118,3 @@ list_untagged_handler (mu_imap_t imap, mu_list_t resp, void *data) | |||
118 | rp->separator = elt->v.string[0]; | 118 | rp->separator = elt->v.string[0]; |
119 | rp->level = count_level (rp->name, rp->separator); | 119 | rp->depth = count_depth (rp->name, rp->separator); |
120 | } | 120 | } |
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 | |||
@@ -39,3 +39,3 @@ _print_list_entry (void *item, void *data) | |||
39 | resp->separator ? resp->separator : ' ', | 39 | resp->separator ? resp->separator : ' ', |
40 | resp->level, | 40 | resp->depth, |
41 | resp->name); | 41 | resp->name); |
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 | |||
@@ -191,3 +191,3 @@ static int | |||
191 | nntp_folder_list (mu_folder_t folder, const char *ref, void *pat, int flags, | 191 | nntp_folder_list (mu_folder_t folder, const char *ref, void *pat, int flags, |