[or-cvs] r17393: {tor} Stop marking bsearch_idx as pure; it is not. (in tor/trunk: . src/common)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-11-26 11:57:46 -0500 (Wed, 26 Nov 2008)
New Revision: 17393

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/common/container.h
Log:
Stop marking bsearch_idx as pure; it is not.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-11-26 16:13:12 UTC (rev 17392)
+++ tor/trunk/ChangeLog	2008-11-26 16:57:46 UTC (rev 17393)
@@ -20,6 +20,9 @@
       rest, and don't automatically fail.
     - Use fcntl() for locking when flock() is not available.  Should fix
       compilation on Solaris.  Should fix Bug 873.  Bugfix on 0.2.1.6-alpha.
+    - Do not mark smartlist_bsearch_idx() function as ATTR_PURE.  This bug
+      could make gcc generate non-functional binary search code. Bugfix
+      on 0.2.0.10-alpha.
 
   o Minor features (controller):
     - Return circuit purposes in response to GETINFO circuit-status.  Fixes

Modified: tor/trunk/src/common/container.h
===================================================================
--- tor/trunk/src/common/container.h	2008-11-26 16:13:12 UTC (rev 17392)
+++ tor/trunk/src/common/container.h	2008-11-26 16:57:46 UTC (rev 17393)
@@ -105,11 +105,10 @@
 void smartlist_uniq_digests(smartlist_t *sl);
 void *smartlist_bsearch(smartlist_t *sl, const void *key,
                         int (*compare)(const void *key, const void **member))
- ATTR_PURE;
+  ATTR_PURE;
 int smartlist_bsearch_idx(const smartlist_t *sl, const void *key,
                           int (*compare)(const void *key, const void **member),
-                          int *found_out)
- ATTR_PURE;
+                          int *found_out);
 
 void smartlist_pqueue_add(smartlist_t *sl,
                           int (*compare)(const void *a, const void *b),