anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/tempq: Make __tempq_index() private 

It has no users outside of unit tests.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-12-14 09:42:34 -05:00
parent 06d62240bb
commit 6bdc481cb4
3 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/deck.cpp
View File

@ -49,6 +49,21 @@ void TempQueue :: del(unsigned int id)
}
static unsigned int __tempq_index(struct queue *queue)
{
unsigned int i = 0;
std::list<TempQueue>::iterator it;
for (it = queue_deck.begin(); it != queue_deck.end(); it++) {
if (&(*it) == queue)
return i;
i++;
}
return queue_deck.size();
}
void tempq_init(struct queue_ops *ops)
{
unsigned int num, i;
@ -114,7 +129,7 @@ void deck :: save(struct queue *queue, enum queue_flags flag)
void deck :: move(queue *queue, unsigned int index)
{
unsigned int old_pos = deck :: index(queue);
unsigned int old_pos = __tempq_index(queue);
std::list<TempQueue>::iterator it_old = queue_deck.begin();
std::list<TempQueue>::iterator it_new = queue_deck.begin();
@ -133,20 +148,6 @@ void deck :: move(queue *queue, unsigned int index)
write();
}
unsigned int deck :: index(queue *queue)
{
unsigned int i = 0;
std::list<TempQueue>::iterator it;
for (it = queue_deck.begin(); it != queue_deck.end(); it++) {
if (&(*it) == queue)
return i;
i++;
}
return queue_deck.size();
}
queue *deck :: get(unsigned int index)
{
std::list<TempQueue>::iterator it;

8
include/core/deck.h
View File

@ -54,14 +54,6 @@ namespace deck
*/
void move(queue *, unsigned int);
/**
* Find the index of the requested queue.
*
* @param queue The queue in question.
* @return The index of the requested queue.
*/
unsigned int index(queue *);
/**
* Access the queue at the specified index.
*

11
tests/core/deck.cpp
View File

@ -26,7 +26,6 @@ static void test_init()
tempq_init(NULL);
test_equal(deck :: next(), NULL);
test_equal(deck :: get(0), NULL);
test_equal(deck :: index(NULL), 0);
test_equal(deck :: get_queues().size(), (size_t)0);
}
@ -73,29 +72,20 @@ static void test_create_mv_destroy()
test_not_equal(q1, Q_NULL);
test_equal(queue_has_flag(q1, Q_ENABLED), true);
test_equal(queue_has_flag(q1, Q_RANDOM), true);
test_equal(deck :: index(q1), (unsigned)2);
test_equal(deck :: get(2), q1);
q2 = tempq_alloc(NULL, 0);
test_not_equal(q2, Q_NULL);
test_equal(queue_has_flag(q2, Q_ENABLED), true);
test_equal(queue_has_flag(q2, Q_RANDOM), false);
test_equal(deck :: index(q2), (unsigned)3);
test_equal(deck :: get(3), q2);
deck :: move(q1, 3);
test_equal(deck :: index(q1), (unsigned)3);
deck :: move(q1, 3);
test_equal(deck :: index(q1), (unsigned)3);
deck :: move(q1, 2);
test_equal(deck :: index(q1), (unsigned)2);
tempq_free(q1);
test_equal(deck :: index(q1), (unsigned)3);
test_equal(deck :: index(q2), (unsigned)2);
tempq_free(q2);
test_equal(deck :: index(q2), (unsigned)2);
test_equal(deck :: get(3), Q_NULL);
}
@ -122,7 +112,6 @@ static void test_next_prev()
}
test_equal(deck :: get_queues().size(), (size_t)1);
test_equal(deck :: index(q1), (unsigned)0);
queue_unset_flag(q1, Q_ENABLED);
queue_unset_flag(collection_get_queue(), Q_RANDOM);