summaryrefslogtreecommitdiffstats
path: root/crypto/pqueue
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2010-06-12 13:18:58 +0000
committerBen Laurie <ben@openssl.org>2010-06-12 13:18:58 +0000
commitd886975835e7e430aeda6ecb1653363b463bc9cf (patch)
tree03ec369d422a0585dc36abb091a4d96ed90e128f /crypto/pqueue
parent22872a536328f52f3cbed8607107d7afbc8881f0 (diff)
Fix gcc 4.6 warnings. Check TLS server hello extension length.
Diffstat (limited to 'crypto/pqueue')
-rw-r--r--crypto/pqueue/pqueue.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/crypto/pqueue/pqueue.c b/crypto/pqueue/pqueue.c
index 6c89f06fb1..8ebba8a856 100644
--- a/crypto/pqueue/pqueue.c
+++ b/crypto/pqueue/pqueue.c
@@ -166,14 +166,13 @@ pqueue_pop(pqueue_s *pq)
pitem *
pqueue_find(pqueue_s *pq, PQ_64BIT priority)
{
- pitem *next, *prev = NULL;
+ pitem *next;
pitem *found = NULL;
if ( pq->items == NULL)
return NULL;
- for ( next = pq->items; next->next != NULL;
- prev = next, next = next->next)
+ for ( next = pq->items; next->next != NULL; next = next->next)
{
if ( pq_64bit_eq(&(next->priority), &priority))
{
@@ -189,13 +188,6 @@ pqueue_find(pqueue_s *pq, PQ_64BIT priority)
if ( ! found)
return NULL;
-#if 0 /* find works in peek mode */
- if ( prev == NULL)
- pq->items = next->next;
- else
- prev->next = next->next;
-#endif
-
return found;
}