projects
/
cgds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify installation procedure
[cgds.git]
/
src
/
Queue.c
diff --git
a/src/Queue.c
b/src/Queue.c
index
47e7dd5
..
3e61381
100644
(file)
--- a/
src/Queue.c
+++ b/
src/Queue.c
@@
-7,12
+7,13
@@
void _queue_init(Queue* queue, size_t dataSize)
{
queue->dataSize = dataSize;
void _queue_init(Queue* queue, size_t dataSize)
{
queue->dataSize = dataSize;
- _
vector_init(queue->array
, dataSize);
+ _
list_init(queue->list
, dataSize);
}
Queue* _queue_new(size_t dataSize)
{
Queue* queue = (Queue*) safe_malloc(sizeof (Queue));
}
Queue* _queue_new(size_t dataSize)
{
Queue* queue = (Queue*) safe_malloc(sizeof (Queue));
+ queue->list = _list_new(dataSize);
_queue_init(queue, dataSize);
return queue;
}
_queue_init(queue, dataSize);
return queue;
}
@@
-21,48
+22,43
@@
Queue* queue_copy(Queue* queue)
{
Queue* queueCopy = (Queue*) safe_malloc(sizeof (Queue));
queueCopy->dataSize = queue->dataSize;
{
Queue* queueCopy = (Queue*) safe_malloc(sizeof (Queue));
queueCopy->dataSize = queue->dataSize;
-
Vector* arrayCopy = vector_copy(queue->array
);
- queueCopy->
array = array
Copy;
+
List* listCopy = list_copy(queue->list
);
+ queueCopy->
list = list
Copy;
return queueCopy;
}
Bool queue_empty(Queue* queue)
{
return queueCopy;
}
Bool queue_empty(Queue* queue)
{
- return
vector_empty(queue->array
);
+ return
list_empty(queue->list
);
}
UInt queue_size(Queue* queue)
{
}
UInt queue_size(Queue* queue)
{
- return
vector_size(queue->array
);
+ return
list_size(queue->list
);
}
void _queue_push(Queue* queue, void* data)
{
}
void _queue_push(Queue* queue, void* data)
{
- _
vector_push(queue->array
, data);
+ _
list_insert_back(queue->list
, data);
}
void* _queue_peek(Queue* queue)
{
}
void* _queue_peek(Queue* queue)
{
- return _
vector_get(queue->array, 0
);
+ return _
list_get(queue->list->head
);
}
void queue_pop(Queue* queue)
{
}
void queue_pop(Queue* queue)
{
- //remove first vector element and shift its internal array
- safe_free(queue->array->datas[0]);
- queue->array->datas++;
- //NOTE: we remove first element, so capacity decrease too
- queue->array->size--;
- queue->array->capacity--;
+ list_remove_front(queue->list);
}
void queue_clear(Queue* queue)
{
}
void queue_clear(Queue* queue)
{
-
vector_clear(queue->array
);
+
list_clear(queue->list
);
}
void queue_destroy(Queue* queue)
{
}
void queue_destroy(Queue* queue)
{
-
queue_clear(queue
);
+
list_destroy(queue->list
);
safe_free(queue);
}
safe_free(queue);
}