From b436a8e3864f6d443b667d5cdc1cfeac1d7567d3 Mon Sep 17 00:00:00 2001 From: jsing Date: Mon, 21 Apr 2014 16:00:04 +0000 Subject: [PATCH] KNF. --- lib/libcrypto/pqueue/pq_test.c | 12 +-- lib/libcrypto/pqueue/pqueue.c | 137 ++++++++++++------------- lib/libcrypto/pqueue/pqueue.h | 11 +- lib/libssl/src/crypto/pqueue/pq_test.c | 12 +-- lib/libssl/src/crypto/pqueue/pqueue.c | 137 ++++++++++++------------- lib/libssl/src/crypto/pqueue/pqueue.h | 11 +- 6 files changed, 154 insertions(+), 166 deletions(-) diff --git a/lib/libcrypto/pqueue/pq_test.c b/lib/libcrypto/pqueue/pq_test.c index 8d496dfc655..4cd785500c3 100644 --- a/lib/libcrypto/pqueue/pq_test.c +++ b/lib/libcrypto/pqueue/pq_test.c @@ -1,7 +1,7 @@ /* crypto/pqueue/pq_test.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,7 +61,7 @@ int main(void) - { +{ pitem *item; pqueue pq; @@ -87,9 +87,9 @@ main(void) pqueue_print(pq); - for(item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq)) + for (item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq)) pitem_free(item); pqueue_free(pq); return 0; - } +} diff --git a/lib/libcrypto/pqueue/pqueue.c b/lib/libcrypto/pqueue/pqueue.c index 3ca8e049e40..5cea75311eb 100644 --- a/lib/libcrypto/pqueue/pqueue.c +++ b/lib/libcrypto/pqueue/pqueue.c @@ -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,190 +61,185 @@ #include #include "pqueue.h" -typedef struct _pqueue - { +typedef struct _pqueue { pitem *items; int count; - } pqueue_s; +} pqueue_s; pitem * pitem_new(unsigned char *prio64be, void *data) - { - pitem *item = (pitem *) malloc(sizeof(pitem)); - if (item == NULL) return NULL; +{ + pitem *item = (pitem *)malloc(sizeof(pitem)); + + if (item == NULL) + return NULL; - memcpy(item->priority,prio64be,sizeof(item->priority)); + memcpy(item->priority, prio64be, sizeof(item->priority)); item->data = data; item->next = NULL; return item; - } +} void pitem_free(pitem *item) - { - if (item == NULL) return; +{ + if (item == NULL) + return; free(item); - } +} pqueue_s * pqueue_new() - { - pqueue_s *pq = (pqueue_s *) malloc(sizeof(pqueue_s)); - if (pq == NULL) return NULL; +{ + pqueue_s *pq = (pqueue_s *)malloc(sizeof(pqueue_s)); + + if (pq == NULL) + return NULL; memset(pq, 0x00, sizeof(pqueue_s)); return pq; - } +} void pqueue_free(pqueue_s *pq) - { - if (pq == NULL) return; +{ + if (pq == NULL) + return; free(pq); - } +} pitem * pqueue_insert(pqueue_s *pq, pitem *item) - { +{ pitem *curr, *next; - if (pq->items == NULL) - { + if (pq->items == NULL) { pq->items = item; return item; - } + } - for(curr = NULL, next = pq->items; - next != NULL; - curr = next, next = next->next) - { + for (curr = NULL, next = pq->items; next != NULL; + curr = next, next = next->next) { /* we can compare 64-bit value in big-endian encoding * with memcmp:-) */ - int cmp = memcmp(next->priority, item->priority,8); + int cmp = memcmp(next->priority, item->priority, 8); if (cmp > 0) /* next > item */ - { + { item->next = next; - if (curr == NULL) + if (curr == NULL) pq->items = item; - else + else curr->next = item; return item; - } - - else if (cmp == 0) /* duplicates not allowed */ + } else if (cmp == 0) /* duplicates not allowed */ return NULL; - } + } item->next = NULL; curr->next = item; return item; - } +} pitem * pqueue_peek(pqueue_s *pq) - { +{ return pq->items; - } +} pitem * pqueue_pop(pqueue_s *pq) - { +{ pitem *item = pq->items; if (pq->items != NULL) pq->items = pq->items->next; return item; - } +} pitem * pqueue_find(pqueue_s *pq, unsigned char *prio64be) - { +{ pitem *next; pitem *found = NULL; - if ( pq->items == NULL) + if (pq->items == NULL) return NULL; - for ( next = pq->items; next->next != NULL; next = next->next) - { - if ( memcmp(next->priority, prio64be,8) == 0) - { + for (next = pq->items; next->next != NULL; next = next->next) { + if (memcmp(next->priority, prio64be, 8) == 0) { found = next; break; - } } - + } + /* check the one last node */ - if ( memcmp(next->priority, prio64be,8) ==0) + if (memcmp(next->priority, prio64be, 8) ==0) found = next; - if ( ! found) + if (! found) return NULL; #if 0 /* find works in peek mode */ - if ( prev == NULL) + if (prev == NULL) pq->items = next->next; else prev->next = next->next; #endif return found; - } +} void pqueue_print(pqueue_s *pq) - { +{ pitem *item = pq->items; - while(item != NULL) - { + while (item != NULL) { printf("item\t%02x%02x%02x%02x%02x%02x%02x%02x\n", - item->priority[0],item->priority[1], - item->priority[2],item->priority[3], - item->priority[4],item->priority[5], - item->priority[6],item->priority[7]); + item->priority[0], item->priority[1], + item->priority[2], item->priority[3], + item->priority[4], item->priority[5], + item->priority[6], item->priority[7]); item = item->next; - } } +} pitem * pqueue_iterator(pqueue_s *pq) - { +{ return pqueue_peek(pq); - } +} pitem * pqueue_next(pitem **item) - { +{ pitem *ret; - if ( item == NULL || *item == NULL) + 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) - { + + while (item != NULL) { count++; item = item->next; } diff --git a/lib/libcrypto/pqueue/pqueue.h b/lib/libcrypto/pqueue/pqueue.h index 87fc9037c8f..729e9abaf25 100644 --- a/lib/libcrypto/pqueue/pqueue.h +++ b/lib/libcrypto/pqueue/pqueue.h @@ -1,7 +1,7 @@ /* crypto/pqueue/pqueue.h */ -/* +/* * 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 @@ -66,12 +66,11 @@ typedef struct _pqueue *pqueue; -typedef struct _pitem - { +typedef struct _pitem { unsigned char priority[8]; /* 64-bit value in big-endian encoding */ void *data; struct _pitem *next; - } pitem; +} pitem; typedef struct _pitem *piterator; diff --git a/lib/libssl/src/crypto/pqueue/pq_test.c b/lib/libssl/src/crypto/pqueue/pq_test.c index 8d496dfc655..4cd785500c3 100644 --- a/lib/libssl/src/crypto/pqueue/pq_test.c +++ b/lib/libssl/src/crypto/pqueue/pq_test.c @@ -1,7 +1,7 @@ /* crypto/pqueue/pq_test.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,7 +61,7 @@ int main(void) - { +{ pitem *item; pqueue pq; @@ -87,9 +87,9 @@ main(void) pqueue_print(pq); - for(item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq)) + for (item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq)) pitem_free(item); pqueue_free(pq); return 0; - } +} diff --git a/lib/libssl/src/crypto/pqueue/pqueue.c b/lib/libssl/src/crypto/pqueue/pqueue.c index 3ca8e049e40..5cea75311eb 100644 --- a/lib/libssl/src/crypto/pqueue/pqueue.c +++ b/lib/libssl/src/crypto/pqueue/pqueue.c @@ -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,190 +61,185 @@ #include #include "pqueue.h" -typedef struct _pqueue - { +typedef struct _pqueue { pitem *items; int count; - } pqueue_s; +} pqueue_s; pitem * pitem_new(unsigned char *prio64be, void *data) - { - pitem *item = (pitem *) malloc(sizeof(pitem)); - if (item == NULL) return NULL; +{ + pitem *item = (pitem *)malloc(sizeof(pitem)); + + if (item == NULL) + return NULL; - memcpy(item->priority,prio64be,sizeof(item->priority)); + memcpy(item->priority, prio64be, sizeof(item->priority)); item->data = data; item->next = NULL; return item; - } +} void pitem_free(pitem *item) - { - if (item == NULL) return; +{ + if (item == NULL) + return; free(item); - } +} pqueue_s * pqueue_new() - { - pqueue_s *pq = (pqueue_s *) malloc(sizeof(pqueue_s)); - if (pq == NULL) return NULL; +{ + pqueue_s *pq = (pqueue_s *)malloc(sizeof(pqueue_s)); + + if (pq == NULL) + return NULL; memset(pq, 0x00, sizeof(pqueue_s)); return pq; - } +} void pqueue_free(pqueue_s *pq) - { - if (pq == NULL) return; +{ + if (pq == NULL) + return; free(pq); - } +} pitem * pqueue_insert(pqueue_s *pq, pitem *item) - { +{ pitem *curr, *next; - if (pq->items == NULL) - { + if (pq->items == NULL) { pq->items = item; return item; - } + } - for(curr = NULL, next = pq->items; - next != NULL; - curr = next, next = next->next) - { + for (curr = NULL, next = pq->items; next != NULL; + curr = next, next = next->next) { /* we can compare 64-bit value in big-endian encoding * with memcmp:-) */ - int cmp = memcmp(next->priority, item->priority,8); + int cmp = memcmp(next->priority, item->priority, 8); if (cmp > 0) /* next > item */ - { + { item->next = next; - if (curr == NULL) + if (curr == NULL) pq->items = item; - else + else curr->next = item; return item; - } - - else if (cmp == 0) /* duplicates not allowed */ + } else if (cmp == 0) /* duplicates not allowed */ return NULL; - } + } item->next = NULL; curr->next = item; return item; - } +} pitem * pqueue_peek(pqueue_s *pq) - { +{ return pq->items; - } +} pitem * pqueue_pop(pqueue_s *pq) - { +{ pitem *item = pq->items; if (pq->items != NULL) pq->items = pq->items->next; return item; - } +} pitem * pqueue_find(pqueue_s *pq, unsigned char *prio64be) - { +{ pitem *next; pitem *found = NULL; - if ( pq->items == NULL) + if (pq->items == NULL) return NULL; - for ( next = pq->items; next->next != NULL; next = next->next) - { - if ( memcmp(next->priority, prio64be,8) == 0) - { + for (next = pq->items; next->next != NULL; next = next->next) { + if (memcmp(next->priority, prio64be, 8) == 0) { found = next; break; - } } - + } + /* check the one last node */ - if ( memcmp(next->priority, prio64be,8) ==0) + if (memcmp(next->priority, prio64be, 8) ==0) found = next; - if ( ! found) + if (! found) return NULL; #if 0 /* find works in peek mode */ - if ( prev == NULL) + if (prev == NULL) pq->items = next->next; else prev->next = next->next; #endif return found; - } +} void pqueue_print(pqueue_s *pq) - { +{ pitem *item = pq->items; - while(item != NULL) - { + while (item != NULL) { printf("item\t%02x%02x%02x%02x%02x%02x%02x%02x\n", - item->priority[0],item->priority[1], - item->priority[2],item->priority[3], - item->priority[4],item->priority[5], - item->priority[6],item->priority[7]); + item->priority[0], item->priority[1], + item->priority[2], item->priority[3], + item->priority[4], item->priority[5], + item->priority[6], item->priority[7]); item = item->next; - } } +} pitem * pqueue_iterator(pqueue_s *pq) - { +{ return pqueue_peek(pq); - } +} pitem * pqueue_next(pitem **item) - { +{ pitem *ret; - if ( item == NULL || *item == NULL) + 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) - { + + while (item != NULL) { count++; item = item->next; } diff --git a/lib/libssl/src/crypto/pqueue/pqueue.h b/lib/libssl/src/crypto/pqueue/pqueue.h index 87fc9037c8f..729e9abaf25 100644 --- a/lib/libssl/src/crypto/pqueue/pqueue.h +++ b/lib/libssl/src/crypto/pqueue/pqueue.h @@ -1,7 +1,7 @@ /* crypto/pqueue/pqueue.h */ -/* +/* * 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 @@ -66,12 +66,11 @@ typedef struct _pqueue *pqueue; -typedef struct _pitem - { +typedef struct _pitem { unsigned char priority[8]; /* 64-bit value in big-endian encoding */ void *data; struct _pitem *next; - } pitem; +} pitem; typedef struct _pitem *piterator; -- 2.20.1