Stop marking bsearch_idx as pure; it is not.

svn:r17393

diff --git a/ChangeLog b/ChangeLog
index 6a9060526f597d257ef2a042aab3bb9d928c60cc..5d2975034daf77b0b9258f2b8e1d76707bb2a0a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@ Changes in version 0.2.1.8-alpha - 2008-??-??
       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

diff --git a/src/common/container.h b/src/common/container.h
index b4ca3582894b820705ca60b83f6539029d05a880..096d385a22d227d3cf9acab03aedf0be24e045bb 100644 (file)
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -105,11 +105,10 @@ void smartlist_uniq_strings(smartlist_t *sl);
 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),