[or-cvs] r13668: Remove redundant check from container.c that gcc 4.2 didnt l (in tor/trunk: . src/common)

nickm at seul.org nickm at seul.org
Fri Feb 22 02:55:02 UTC 2008


Author: nickm
Date: 2008-02-21 21:55:02 -0500 (Thu, 21 Feb 2008)
New Revision: 13668

Modified:
   tor/trunk/
   tor/trunk/src/common/container.c
Log:
 r18356 at catbus:  nickm | 2008-02-21 21:54:55 -0500
 Remove redundant check from container.c that gcc 4.2 didnt like



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18356] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/container.c
===================================================================
--- tor/trunk/src/common/container.c	2008-02-21 23:09:51 UTC (rev 13667)
+++ tor/trunk/src/common/container.c	2008-02-22 02:55:02 UTC (rev 13668)
@@ -92,7 +92,6 @@
   int new_size = s1->num_used + s2->num_used;
   tor_assert(new_size >= s1->num_used); /* check for overflow. */
   smartlist_ensure_capacity(s1, new_size);
-  tor_assert(s1->capacity >= new_size);
   memcpy(s1->list + s1->num_used, s2->list, s2->num_used*sizeof(void*));
   s1->num_used = new_size;
 }



More information about the tor-commits mailing list