From 5458ca39e8fd0ef582f3ed690fa589e44daf5c6b Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Sat, 13 Dec 2003 06:56:21 +0000
Subject: [PATCH] minor tweaks to the smartlist operations

svn:r903
---
 src/common/util.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/util.c b/src/common/util.c
index 11609e256a..dcce69bc15 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -88,13 +88,19 @@ void smartlist_free(smartlist_t *sl) {
 void smartlist_add(smartlist_t *sl, void *element) {
   if(sl->num_used < sl->max)
     sl->list[sl->num_used++] = element;
+  else
+    log_fn(LOG_WARN,"We've already got %d elements, discarding.",sl->max);
 }
 
 void smartlist_remove(smartlist_t *sl, void *element) {
   int i;
+  if(element == NULL)
+    return;
   for(i=0; i < sl->num_used; i++)
-    if(sl->list[i] == element)
+    if(sl->list[i] == element) {
       sl->list[i] = sl->list[--sl->num_used]; /* swap with the end */
+      i--; /* so we process the new i'th element */
+    }
 }
 
 void *smartlist_choose(smartlist_t *sl) {