summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-01-15 01:47:37 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-01-15 01:47:37 +0000
commit2dfe28b338e148651a12e76d26a20aeb65998ecc (patch)
treec05b0880655d2e54a1cd109d7c55d44f9f4898b2
parent3037339ec05084fc866a90a3f166787e91a90d60 (diff)
downloads6-linux-utils-2dfe28b338e148651a12e76d26a20aeb65998ecc.tar.xz
Cosmetic fix: avltree_iter -> avltree_iter_nocancel
-rw-r--r--src/minutils/s6-ps.c2
-rw-r--r--src/minutils/s6ps_otree.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/minutils/s6-ps.c b/src/minutils/s6-ps.c
index 5a22068..f4f06bd 100644
--- a/src/minutils/s6-ps.c
+++ b/src/minutils/s6-ps.c
@@ -296,7 +296,7 @@ int main (int argc, char const *const *argv)
strerr_diefu1sys(111, "avltreeb_insert") ;
if (flagtree) s6ps_otree(p, n+1, &pidtree.info, orderedlist) ;
- else avltreeb_iter(&pidtree, &fillo_notree, orderedlist) ;
+ else avltreeb_iter_nocancel(&pidtree, avltreeb_totalsize(&pidtree), &fillo_notree, orderedlist) ;
}
diff --git a/src/minutils/s6ps_otree.c b/src/minutils/s6ps_otree.c
index 5e96409..562a66d 100644
--- a/src/minutils/s6ps_otree.c
+++ b/src/minutils/s6ps_otree.c
@@ -78,7 +78,7 @@ void s6ps_otree (pscan_t *p, unsigned int n, avltreen *pidtree, unsigned int *or
unsigned int cpos[n] ;
ptreeiter_t blah = { .childlist = childlist, .childindex = childindex, .ppindex = orderedlist, .cpos = cpos } ;
for (i = 0 ; i < n ; i++) cpos[i] = 0 ;
- avltreen_iter(pidtree, &fillchildlist, &blah) ;
+ avltreen_iter_nocancel(pidtree, avltreen_totalsize(pidtree), &fillchildlist, &blah) ;
}
/* If we have init, make it the last in the orphan list */