X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpdeq.c;h=850626b00b92779b51471a931576031b90d4f16c;hb=be375dcbb1195db1ed6a7ea7e4787456fb1d7b4f;hp=8f679e0405bdcd923c5340ec2923229d72535e18;hpb=bd5c489b499e2ea46dfc28e40e4961777f9feec8;p=libfirm diff --git a/ir/adt/pdeq.c b/ir/adt/pdeq.c index 8f679e040..850626b00 100644 --- a/ir/adt/pdeq.c +++ b/ir/adt/pdeq.c @@ -9,18 +9,21 @@ * Copyright: (c) 1995, 1996 Christian von Roques * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ - - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif + #include -#include -#include -# ifdef HAVE_STRING_H -# include -# endif #include "fourcc.h" #include "pdeq.h" @@ -51,13 +54,13 @@ */ struct pdeq { #ifndef NDEBUG - unsigned magic; /**< debug magic */ + unsigned magic; /**< debug magic */ #endif - pdeq *l_end, *r_end; /**< left and right ends of the deque */ - pdeq *l, *r; /**< left and right neighbour */ - int n; /**< number of elements in the current chunk */ - int p; /**< the read/write pointer */ - const void *data[1]; /**< storage for elements */ + pdeq *l_end, *r_end; /**< left and right ends of the queue */ + pdeq *l, *r; /**< left and right neighbor */ + int n; /**< number of elements in the current chunk */ + int p; /**< the read/write pointer */ + const void *data[1]; /**< storage for elements */ }; @@ -65,12 +68,12 @@ struct pdeq { * cache of unused, pdeq blocks to speed up new_pdeq and del_pdeq. * +1 for compilers that can't grok empty arrays */ -pdeq *pdeq_block_cache[TUNE_NSAVED_PDEQS+1]; +static pdeq *pdeq_block_cache[TUNE_NSAVED_PDEQS+1]; /** * Number of pdeqs in pdeq_store. */ -unsigned pdeqs_cached; +static unsigned pdeqs_cached; /** * Free a pdeq chunk, put in into the cache if possible. @@ -100,7 +103,7 @@ static INLINE pdeq *alloc_pdeq_block (void) if (TUNE_NSAVED_PDEQS && pdeqs_cached) { p = pdeq_block_cache[--pdeqs_cached]; } else { - p = xmalloc (PREF_MALLOC_SIZE); + p = xmalloc(PREF_MALLOC_SIZE); } return p; } @@ -116,7 +119,6 @@ void _pdeq_vrfy(pdeq *dq) { pdeq *q; - assert ( dq && (dq->magic == PDEQ_MAGIC1) && (dq->l_end && dq->r_end)); @@ -186,7 +188,7 @@ int pdeq_empty(pdeq *dq) return dq->l_end->n == 0; } -/* Returns the lenght of a double ended pointer list. */ +/* Returns the length of a double ended pointer list. */ int pdeq_len(pdeq *dq) { int n; @@ -205,7 +207,7 @@ int pdeq_len(pdeq *dq) } /* Add a pointer to the right site of a double ended pointer list. */ -pdeq * pdeq_putr(pdeq *dq, const void *x) +pdeq *pdeq_putr(pdeq *dq, const void *x) { pdeq *rdq; int n; @@ -437,11 +439,11 @@ void **pdeq_copyl(pdeq *dq, const void **dst) if (n + p > NDATA) { int nn = NDATA - p; - memcpy(d, &q->data[p], nn * sizeof(void *)); d += nn; + memcpy((void *) d, &q->data[p], nn * sizeof(void *)); d += nn; p = 0; n -= nn; } - memcpy(d, &q->data[p], n * sizeof(void *)); d += n; + memcpy((void *) d, &q->data[p], n * sizeof(void *)); d += n; q = q->r; }