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
@@ -26,13 +26,13 @@ static int
 enumfun (mu_folder_t folder, struct mu_list_response *resp, void *data)
 {
   printf ("%c%c %c %4d %s\n",
           (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-',
           (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-',
           resp->separator,
-          resp->level,
+          resp->depth,
           resp->name);
   return 0;
 }
 
 int
 ls_folders (char *fname, char *ref, char *pattern, int level)
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
@@ -40,15 +40,15 @@ class Folder
   ~Folder ();
 
   void open ();
   void open (int flag);
   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);
 
   Url& get_url ();
 };
 
 }
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
@@ -24,15 +24,15 @@
 extern "C" {
 #endif
 
 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 */
 };
 
 typedef int (*mu_folder_match_fp) (const char *, void *, int);
 typedef int (*mu_folder_enumerate_fp) (mu_folder_t, struct mu_list_response *,
                                        void *data);
@@ -63,13 +63,14 @@ extern int mu_folder_is_local (mu_folder_t folder);
 */
 struct mu_folder_scanner
 {
   char const *refname;     /* Reference name */
   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 */
   mu_list_t records;        /* List of allowed records */
   mu_list_t result;         /* Result list */
 };
 
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
@@ -353,24 +353,24 @@ mu_folder_scan (mu_folder_t folder, struct mu_folder_scanner *scn)
     mu_list_set_destroy_item (scn->result, mu_list_response_free);
   return folder->_list (folder, 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);
 }
 
 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)
 {
   int status;
   if (folder == NULL || (!pflist && !enumfun))
     return EINVAL;
@@ -380,13 +380,13 @@ mu_folder_enumerate (mu_folder_t folder, const char *name,
     {
       struct mu_folder_scanner scn;
 
       scn.refname = name;
       scn.pattern = pattern;
       scn.match_flags = flags;
-      scn.max_level = max_level;
+      scn.max_depth = max_depth;
       scn.enumfun = enumfun;
       scn.enumdata = enumdata;
       scn.records = NULL;
       if (pflist)
         {
           status = mu_list_create (&scn.result);
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
@@ -291,19 +291,19 @@ best_match (mu_list_t records, char const *refname,
 }
 
 static int
 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;
   struct dirent *dp;
   int stop = 0;
     
-  if (scn->max_level && level >= scn->max_level)
+  if (scn->max_depth && depth >= scn->max_depth)
     return 0;
 
   dirp = opendir (dirname);
   if (dirp == NULL)
     {
       mu_debug (MU_DEBCAT_FOLDER, MU_DEBUG_ERROR,
@@ -374,13 +374,13 @@ list_helper (struct mu_folder_scanner *scn,
                       if (f == MU_FOLDER_ATTRIBUTE_DIRECTORY)
                         type = f;
                     }
                   else
                     {
                       resp->name = fname;
-                      resp->level = level;
+                      resp->depth = depth;