Don't get private with smartlists when there's a perfectly fine accessor method for num_used

svn:r10724
This commit is contained in:
Peter Palfrader 2007-07-02 19:45:44 +00:00
parent f274c1413e
commit ccefd7404e

View File

@ -1867,7 +1867,7 @@ routerlist_is_overfull(routerlist_t *rl)
static INLINE int static INLINE int
_routerlist_find_elt(smartlist_t *sl, void *ri, int idx) _routerlist_find_elt(smartlist_t *sl, void *ri, int idx)
{ {
tor_assert(idx < sl->num_used); tor_assert(idx < smartlist_len(sl));
if (idx < 0 || smartlist_get(sl, idx) != ri) { if (idx < 0 || smartlist_get(sl, idx) != ri) {
idx = -1; idx = -1;
SMARTLIST_FOREACH(sl, routerinfo_t *, r, SMARTLIST_FOREACH(sl, routerinfo_t *, r,
@ -2422,7 +2422,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
router->cache_info.identity_digest); router->cache_info.identity_digest);
if (old_router) { if (old_router) {
int pos = old_router->routerlist_index; int pos = old_router->routerlist_index;
tor_assert(0 <= pos && pos < routerlist->routers->num_used); tor_assert(0 <= pos && pos < smartlist_len(routerlist->routers));
tor_assert(smartlist_get(routerlist->routers, pos) == old_router); tor_assert(smartlist_get(routerlist->routers, pos) == old_router);
if (router->cache_info.published_on <= if (router->cache_info.published_on <=