From 090c5c607ec682e5cfc03bbc745cd1ed28d5d6ce Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 31 Dec 2012 14:38:13 -0600
Subject: Make dirtree_handle_callback() start with dirtree_ like the rest of
the dirtree functions.
---
lib/dirtree.c | 8 ++++----
lib/lib.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'lib')
diff --git a/lib/dirtree.c b/lib/dirtree.c
index c9660fc7..e119c5d1 100644
--- a/lib/dirtree.c
+++ b/lib/dirtree.c
@@ -22,7 +22,7 @@ int dirtree_notdotdot(struct dirtree *catch)
// Create a dirtree node from a path, with stat and symlink info.
// (This doesn't open directory filehandles yet so as not to exhaust the
-// filehandle space on large trees. handle_callback() does that instead.)
+// filehandle space on large trees, dirtree_handle_callback() does that.)
struct dirtree *dirtree_add_node(struct dirtree *parent, char *name,
int symfollow)
@@ -102,7 +102,7 @@ int dirtree_parentfd(struct dirtree *node)
// hit, free structures after use, and return NULL.
//
-struct dirtree *handle_callback(struct dirtree *new,
+struct dirtree *dirtree_handle_callback(struct dirtree *new,
int (*callback)(struct dirtree *node))
{
int flags, dir = S_ISDIR(new->st.st_mode);
@@ -154,7 +154,7 @@ void dirtree_recurse(struct dirtree *node,
while ((entry = readdir(dir))) {
if (!(new = dirtree_add_node(node, entry->d_name, symfollow)))
continue;
- new = handle_callback(new, callback);
+ new = dirtree_handle_callback(new, callback);
if (new == DIRTREE_ABORTVAL) break;
if (new) {
*ddt = new;
@@ -176,5 +176,5 @@ struct dirtree *dirtree_read(char *path, int (*callback)(struct dirtree *node))
{
struct dirtree *root = dirtree_add_node(0, path, 0);
- return root ? handle_callback(root, callback) : DIRTREE_ABORTVAL;
+ return root ? dirtree_handle_callback(root, callback) : DIRTREE_ABORTVAL;
}
diff --git a/lib/lib.h b/lib/lib.h
index 17aaea25..d3d15b81 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -74,7 +74,7 @@ struct dirtree *dirtree_add_node(struct dirtree *p, char *name, int symfollow);
char *dirtree_path(struct dirtree *node, int *plen);
int dirtree_notdotdot(struct dirtree *catch);
int dirtree_parentfd(struct dirtree *node);
-struct dirtree *handle_callback(struct dirtree *new,
+struct dirtree *dirtree_handle_callback(struct dirtree *new,
int (*callback)(struct dirtree *node));
void dirtree_recurse(struct dirtree *node,
int (*callback)(struct dirtree *node), int symfollow);
--
cgit v1.2.3