Run util/openssl-format-source -v -c .

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-01-22 02:47:42 +00:00
parent 9d03aabea3
commit 40720ce3ca
987 changed files with 225809 additions and 225646 deletions

View File

@@ -1,7 +1,7 @@
/* crypto/pqueue/pqueue.c */
/*
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
*/
/* ====================================================================
* Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
@@ -11,7 +11,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -61,182 +61,164 @@
#include <openssl/bn.h>
#include "pqueue.h"
typedef struct _pqueue
{
pitem *items;
int count;
} pqueue_s;
typedef struct _pqueue {
pitem *items;
int count;
} pqueue_s;
pitem *
pitem_new(PQ_64BIT priority, void *data)
{
pitem *item = (pitem *) OPENSSL_malloc(sizeof(pitem));
if (item == NULL) return NULL;
pitem *pitem_new(PQ_64BIT priority, void *data)
{
pitem *item = (pitem *)OPENSSL_malloc(sizeof(pitem));
if (item == NULL)
return NULL;
pq_64bit_init(&(item->priority));
pq_64bit_assign(&item->priority, &priority);
pq_64bit_init(&(item->priority));
pq_64bit_assign(&item->priority, &priority);
item->data = data;
item->next = NULL;
item->data = data;
item->next = NULL;
return item;
}
return item;
}
void
pitem_free(pitem *item)
{
if (item == NULL) return;
void pitem_free(pitem *item)
{
if (item == NULL)
return;
pq_64bit_free(&(item->priority));
OPENSSL_free(item);
}
pq_64bit_free(&(item->priority));
OPENSSL_free(item);
}
pqueue_s *
pqueue_new()
{
pqueue_s *pq = (pqueue_s *) OPENSSL_malloc(sizeof(pqueue_s));
if (pq == NULL) return NULL;
pqueue_s *pqueue_new()
{
pqueue_s *pq = (pqueue_s *)OPENSSL_malloc(sizeof(pqueue_s));
if (pq == NULL)
return NULL;
memset(pq, 0x00, sizeof(pqueue_s));
return pq;
}
memset(pq, 0x00, sizeof(pqueue_s));
return pq;
}
void
pqueue_free(pqueue_s *pq)
{
if (pq == NULL) return;
void pqueue_free(pqueue_s *pq)
{
if (pq == NULL)
return;
OPENSSL_free(pq);
}
OPENSSL_free(pq);
}
pitem *
pqueue_insert(pqueue_s *pq, pitem *item)
{
pitem *curr, *next;
pitem *pqueue_insert(pqueue_s *pq, pitem *item)
{
pitem *curr, *next;
if (pq->items == NULL)
{
pq->items = item;
return item;
}
if (pq->items == NULL) {
pq->items = item;
return item;
}
for(curr = NULL, next = pq->items;
next != NULL;
curr = next, next = next->next)
{
if (pq_64bit_gt(&(next->priority), &(item->priority)))
{
item->next = next;
for (curr = NULL, next = pq->items;
next != NULL; curr = next, next = next->next) {
if (pq_64bit_gt(&(next->priority), &(item->priority))) {
item->next = next;
if (curr == NULL)
pq->items = item;
else
curr->next = item;
if (curr == NULL)
pq->items = item;
else
curr->next = item;
return item;
}
/* duplicates not allowed */
if (pq_64bit_eq(&(item->priority), &(next->priority)))
return NULL;
}
return item;
}
/* duplicates not allowed */
if (pq_64bit_eq(&(item->priority), &(next->priority)))
return NULL;
}
item->next = NULL;
curr->next = item;
item->next = NULL;
curr->next = item;
return item;
}
return item;
}
pitem *
pqueue_peek(pqueue_s *pq)
{
return pq->items;
}
pitem *pqueue_peek(pqueue_s *pq)
{
return pq->items;
}
pitem *
pqueue_pop(pqueue_s *pq)
{
pitem *item = pq->items;
pitem *pqueue_pop(pqueue_s *pq)
{
pitem *item = pq->items;
if (pq->items != NULL)
pq->items = pq->items->next;
if (pq->items != NULL)
pq->items = pq->items->next;
return item;
}
return item;
}
pitem *
pqueue_find(pqueue_s *pq, PQ_64BIT priority)
{
pitem *next;
pitem *found = NULL;
pitem *pqueue_find(pqueue_s *pq, PQ_64BIT priority)
{
pitem *next;
pitem *found = NULL;
if ( pq->items == NULL)
return NULL;
if (pq->items == NULL)
return NULL;
for ( next = pq->items; next->next != NULL; next = next->next)
{
if ( pq_64bit_eq(&(next->priority), &priority))
{
found = next;
break;
}
}
/* check the one last node */
if ( pq_64bit_eq(&(next->priority), &priority))
found = next;
for (next = pq->items; next->next != NULL; next = next->next) {
if (pq_64bit_eq(&(next->priority), &priority)) {
found = next;
break;
}
}
if ( ! found)
return NULL;
/* check the one last node */
if (pq_64bit_eq(&(next->priority), &priority))
found = next;
return found;
}
if (!found)
return NULL;
return found;
}
#if PQ_64BIT_IS_INTEGER
void
pqueue_print(pqueue_s *pq)
{
pitem *item = pq->items;
void pqueue_print(pqueue_s *pq)
{
pitem *item = pq->items;
while(item != NULL)
{
printf("item\t" PQ_64BIT_PRINT "\n", item->priority);
item = item->next;
}
}
while (item != NULL) {
printf("item\t" PQ_64BIT_PRINT "\n", item->priority);
item = item->next;
}
}
#endif
pitem *
pqueue_iterator(pqueue_s *pq)
{
return pqueue_peek(pq);
}
pitem *
pqueue_next(pitem **item)
{
pitem *ret;
if ( item == NULL || *item == NULL)
return NULL;
/* *item != NULL */
ret = *item;
*item = (*item)->next;
return ret;
}
int
pqueue_size(pqueue_s *pq)
pitem *pqueue_iterator(pqueue_s *pq)
{
pitem *item = pq->items;
int count = 0;
while(item != NULL)
{
count++;
item = item->next;
}
return count;
return pqueue_peek(pq);
}
pitem *pqueue_next(pitem **item)
{
pitem *ret;
if (item == NULL || *item == NULL)
return NULL;
/* *item != NULL */
ret = *item;
*item = (*item)->next;
return ret;
}
int pqueue_size(pqueue_s *pq)
{
pitem *item = pq->items;
int count = 0;
while (item != NULL) {
count++;
item = item->next;
}
return count;
}