From 651a0a2fb5856a0e14e745b33a8d3d97387df862 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 26 Nov 2008 16:57:46 +0000 Subject: [PATCH] Stop marking bsearch_idx as pure; it is not. svn:r17393 --- ChangeLog | 3 +++ src/common/container.h | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a9060526f..5d2975034d 100644 --- 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 b4ca358289..096d385a22 100644 --- 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),