From bb97d7f4ea9e18e33831e1d4e4ae6cb565c216da Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 18 Jul 2005 23:16:09 +0000 Subject: [PATCH] slightly cleaner fix svn:r4599 --- src/common/container.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index 01080612c9..3ddca27f26 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -370,13 +370,12 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, 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; }