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
@@ -30,5 +30,5 @@ enumfun (mu_folder_t folder, struct mu_list_response *resp, void *data)
           (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-',
           resp->separator,
-          resp->level,
+          resp->depth,
           resp->name);
   return 0;
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
@@ -44,7 +44,7 @@ class Folder
   void close ();
 
-  List& list (const std::string& dirname, void* pattern, size_t max_level);
+  List& list (const std::string& dirname, void* pattern, size_t max_depth);
   List& enumerate (const std::string& name, void* pattern,
-                   int flags, size_t max_level,
+                   int flags, size_t max_depth,
                    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
@@ -28,7 +28,7 @@ struct mu_list_response
 {
   int type;             /* MU_FOLDER_ATTRIBUTE_.* flags */
-  int level;
-  int separator;
-  char *name;
+  int depth;            /* Item depth within the hierarchy */
+  int separator;        /* Directory separator character */
+  char *name;           /* Item name */
   mu_record_t format;   /* Associated mailbox format record */
 };
@@ -67,5 +67,6 @@ struct mu_folder_scanner
   void *pattern;           /* Matching pattern */
   int match_flags;         /* Matching flags */
-  size_t max_level;        /* Max. nesting level to descend */
+  size_t max_depth;        /* Max. depth to descend
+                              (1-based, 0 means 'unlimited') */
   mu_folder_enumerate_fp enumfun; /* Enumeration function */
   void *enumdata;                 /* Data for enumfun */
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
@@ -357,9 +357,9 @@ mu_folder_scan (mu_folder_t folder, struct mu_folder_scanner *scn)
 int
 mu_folder_list (mu_folder_t folder, const char *dirname, void *pattern,
-                size_t max_level,
+                size_t max_depth,
                 mu_list_t *pflist)
 {
   return mu_folder_enumerate (folder, dirname, pattern,
-                              MU_FOLDER_ATTRIBUTE_ALL, max_level,
+                              MU_FOLDER_ATTRIBUTE_ALL, max_depth,
                               pflist, NULL, NULL);
 }
@@ -368,5 +368,5 @@ int
 mu_folder_enumerate (mu_folder_t folder, const char *name,
                      void *pattern, int flags,
-                     size_t max_level,
+                     size_t max_depth,
                      mu_list_t *pflist,
                      mu_folder_enumerate_fp enumfun, void *enumdata)
@@ -384,5 +384,5 @@ mu_folder_enumerate (mu_folder_t folder, const char *name,
       scn.pattern = pattern;
       scn.match_flags = flags;
-      scn.max_level = max_level;
+      scn.max_depth = max_depth;
       scn.enumfun = enumfun;
       scn.enumdata = enumdata;
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
@@ -295,5 +295,5 @@ list_helper (struct mu_folder_scanner *scn,
              struct folder_scan_data *data,
              struct inode_list *ilist,
-             const char *dirname, size_t level)
+             const char *dirname, size_t depth)
 {
   DIR *dirp;
@@ -301,5 +301,5 @@ list_helper (struct mu_folder_scanner *scn,
   int stop = 0;
     
-  if (scn->max_level && level >= scn->max_level)
+  if (scn->max_depth && depth >= scn->max_depth)
     return 0;
 
@@ -378,5 +378,5 @@ list_helper (struct mu_folder_scanner *scn,
                     {
                       resp->name = fname;
-                      resp->level = level;
+                      resp->depth = depth;
                       resp->separator = '/';
                       resp->type = type;
@@ -422,5 +422,5 @@ list_helper (struct mu_folder_scanner *scn,
                       idata.next  = ilist;
                       stop = list_helper (scn, data, &idata, refname,
-                                          level + 1);
+                                          depth + 1);
                     }
                 }
@@ -432,5 +432,5 @@ list_helper (struct mu_folder_scanner *scn,
                   idata.dev   = st.st_dev;
                   idata.next  = ilist;
-                  stop = list_helper (scn, data, &idata, fname, level + 1);
+                  stop = list_helper (scn, data, &idata, fname, depth + 1);
                 }
             }
@@ -509,5 +509,5 @@ _fsfolder_lsub (mu_folder_t folder, const char *ref, const char *name,
                 }
               resp->type = MU_FOLDER_ATTRIBUTE_FILE;
-              resp->level = 0;
+              resp->depth = 0;
               resp->separator = '/';
               rc = mu_list_append (flist, resp);
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
@@ -45,7 +45,7 @@ compare_response (void const *a, void const *b)
   struct mu_list_response const *rb = b;
 
-  if (ra->level < rb->level)
+  if (ra->depth < rb->depth)
     return -1;
-  if (ra->level > rb->level)
+  if (ra->depth > rb->depth)
     return 1;
   return strcmp (ra->name, rb->name);
@@ -61,5 +61,5 @@ _print_list_entry (void *item, void *data)
              (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-',
              resp->separator ? resp->separator : ' ',
-             resp->level,
+             resp->depth,
              resp->name + len);
   return 0;
@@ -174,5 +174,5 @@ com_scan (int argc, char **argv, mu_assoc_t options, void *env)
       char *p;
       errno = 0;
-      scn.max_level = strtoul (s, &p, 10);
+      scn.max_depth = strtoul (s, &p, 10);
       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
@@ -83,10 +83,10 @@ Folder :: close ()
 List&
 Folder :: list (const std::string& dirname, void* pattern,
-                size_t max_level = 0)
+                size_t max_depth = 0)
 {
   mu_list_t c_list;
 
   int status = mu_folder_list (folder, dirname.c_str (), pattern,
-                               max_level, &c_list);
+                               max_depth, &c_list);
   if (status)
     throw Exception ("Folder::list", status);
@@ -97,5 +97,5 @@ Folder :: list (const std::string& dirname, void* pattern,
 List&
 Folder :: enumerate (const std::string& name, void* pattern,
-                     int flags, size_t max_level,
+                     int flags, size_t max_depth,
                      mu_folder_enumerate_fp enumfun, void* enumdata)
 {
@@ -103,5 +103,5 @@ Folder :: enumerate (const std::string& name, void* pattern,
 
   int status = mu_folder_enumerate (folder, name.c_str (), pattern,