Mercurial > hg > toybox
changeset 779:90e98cdb1b7c
Make dirtree_handle_callback() start with dirtree_ like the rest of the dirtree functions.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 31 Dec 2012 14:38:13 -0600 |
parents | 14aabcd31fd9 |
children | 6cc69be43c42 |
files | lib/dirtree.c lib/lib.h toys/posix/chgrp.c toys/posix/du.c |
diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/dirtree.c Sun Dec 30 21:35:01 2012 -0600 +++ b/lib/dirtree.c Mon Dec 31 14:38:13 2012 -0600 @@ -22,7 +22,7 @@ // 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 @@ // 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 @@ 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 *root = dirtree_add_node(0, path, 0); - return root ? handle_callback(root, callback) : DIRTREE_ABORTVAL; + return root ? dirtree_handle_callback(root, callback) : DIRTREE_ABORTVAL; }
--- a/lib/lib.h Sun Dec 30 21:35:01 2012 -0600 +++ b/lib/lib.h Mon Dec 31 14:38:13 2012 -0600 @@ -74,7 +74,7 @@ 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);
--- a/toys/posix/chgrp.c Sun Dec 30 21:35:01 2012 -0600 +++ b/toys/posix/chgrp.c Mon Dec 31 14:38:13 2012 -0600 @@ -104,7 +104,7 @@ for (s=toys.optargs+1; *s; s++) { struct dirtree *new = dirtree_add_node(0, *s, hl); - if (new) handle_callback(new, do_chgrp); + if (new) dirtree_handle_callback(new, do_chgrp); else toys.exitval = 1; }
--- a/toys/posix/du.c Sun Dec 30 21:35:01 2012 -0600 +++ b/toys/posix/du.c Mon Dec 31 14:38:13 2012 -0600 @@ -206,7 +206,7 @@ struct dirtree *root = dirtree_add_node(0, path, symfollow); if(root) { TT.st_dev = root->st.st_dev; - handle_callback(root, do_du); //this will recurse thru the DIR children. + dirtree_handle_callback(root, do_du); // recurse thru the DIR children. } toys.optargs++; }