summaryrefslogtreecommitdiff
path: root/libmailutils
diff options
context:
space:
mode:
Diffstat (limited to 'libmailutils')
-rw-r--r--libmailutils/mailbox/folder.c8
-rw-r--r--libmailutils/mailbox/fsfolder.c12
-rw-r--r--libmailutils/tests/fsfolder.c8
3 files changed, 14 insertions, 14 deletions
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
@@ -356,18 +356,18 @@ 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);
}
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)
{
@@ -383,7 +383,7 @@ mu_folder_enumerate (mu_folder_t folder, const char *name,
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;
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
@@ -294,13 +294,13 @@ 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);
@@ -377,7 +377,7 @@ list_helper (struct mu_folder_scanner *scn,
else
{
resp->name = fname;
- resp->level = level;
+ resp->depth = depth;
resp->separator = '/';
resp->type = type;
resp->format = rec;
@@ -421,7 +421,7 @@ list_helper (struct mu_folder_scanner *scn,
idata.dev = st.st_dev;
idata.next = ilist;
stop = list_helper (scn, data, &idata, refname,
- level + 1);
+ depth + 1);
}
}
else if (S_ISDIR (st.st_mode))
@@ -431,7 +431,7 @@ list_helper (struct mu_folder_scanner *scn,
idata.inode = st.st_ino;
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);
}
}
}
@@ -508,7 +508,7 @@ _fsfolder_lsub (mu_folder_t folder, const char *ref, const char *name,
break;
}
resp->type = MU_FOLDER_ATTRIBUTE_FILE;
- resp->level = 0;
+ resp->depth = 0;
resp->separator = '/';
rc = mu_list_append (flist, resp);
if (rc)
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
@@ -44,9 +44,9 @@ compare_response (void const *a, void const *b)
struct mu_list_response const *ra = a;
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);
}
@@ -60,7 +60,7 @@ _print_list_entry (void *item, void *data)
(resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-',
(resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-',
resp->separator ? resp->separator : ' ',
- resp->level,
+ resp->depth,
resp->name + len);
return 0;
}
@@ -173,7 +173,7 @@ 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)
{
mu_error ("-maxdepth=%s: invalid depth", s);

Return to:

Send suggestions and report system problems to the System administrator.