[or-cvs] slightly cleaner fix

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/common
In directory moria:/home/arma/work/onion/cvs/tor/src/common

Modified Files:
	container.c 
Log Message:
slightly cleaner fix


Index: container.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/container.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- container.c	18 Jul 2005 23:11:46 -0000	1.29
+++ container.c	18 Jul 2005 23:16:09 -0000	1.30
@@ -370,13 +370,12 @@
   for (i = 0; i < sl->num_used; ) {
     for (src = sl->list[i]; *src; )
       *dst++ = *src++;
-    if (++i < sl->num_used || terminate) {
+    if (++i < sl->num_used) {
       memcpy(dst, join, join_len);
       dst += join_len;
     }
   }
-  if (sl->num_used == 0 && terminate) {
-    /* another special case for length == 0 */
+  if (terminate) {
     memcpy(dst, join, join_len);
     dst += join_len;
   }