mirror of
https://github.com/xzeldon/htop.git
synced 2025-07-12 12:14:36 +03:00
Embracing branches
This commit is contained in:
32
Vector.c
32
Vector.c
@ -17,8 +17,10 @@ in the source distribution for its full text.
|
||||
Vector* Vector_new(const ObjectClass* type, bool owner, int size) {
|
||||
Vector* this;
|
||||
|
||||
if (size == DEFAULT_SIZE)
|
||||
if (size == DEFAULT_SIZE) {
|
||||
size = 10;
|
||||
}
|
||||
|
||||
assert(size > 0);
|
||||
this = xMalloc(sizeof(Vector));
|
||||
this->growthRate = size;
|
||||
@ -32,9 +34,11 @@ Vector* Vector_new(const ObjectClass* type, bool owner, int size) {
|
||||
|
||||
void Vector_delete(Vector* this) {
|
||||
if (this->owner) {
|
||||
for (int i = 0; i < this->items; i++)
|
||||
if (this->array[i])
|
||||
for (int i = 0; i < this->items; i++) {
|
||||
if (this->array[i]) {
|
||||
Object_delete(this->array[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
free(this->array);
|
||||
free(this);
|
||||
@ -45,9 +49,11 @@ void Vector_delete(Vector* this) {
|
||||
static bool Vector_isConsistent(const Vector* this) {
|
||||
assert(this->items <= this->arraySize);
|
||||
if (this->owner) {
|
||||
for (int i = 0; i < this->items; i++)
|
||||
if (this->array[i] && !Object_isA(this->array[i], this->type))
|
||||
for (int i = 0; i < this->items; i++) {
|
||||
if (this->array[i] && !Object_isA(this->array[i], this->type)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
return true;
|
||||
@ -57,8 +63,9 @@ static bool Vector_isConsistent(const Vector* this) {
|
||||
int Vector_count(const Vector* this) {
|
||||
int items = 0;
|
||||
for (int i = 0; i < this->items; i++) {
|
||||
if (this->array[i])
|
||||
if (this->array[i]) {
|
||||
items++;
|
||||
}
|
||||
}
|
||||
assert(items == this->items);
|
||||
return items;
|
||||
@ -230,15 +237,18 @@ Object* Vector_remove(Vector* this, int idx) {
|
||||
if (this->owner) {
|
||||
Object_delete(removed);
|
||||
return NULL;
|
||||
} else
|
||||
} else {
|
||||
return removed;
|
||||
}
|
||||
}
|
||||
|
||||
void Vector_moveUp(Vector* this, int idx) {
|
||||
assert(idx >= 0 && idx < this->items);
|
||||
assert(Vector_isConsistent(this));
|
||||
|
||||
if (idx == 0)
|
||||
return;
|
||||
|
||||
Object* temp = this->array[idx];
|
||||
this->array[idx] = this->array[idx - 1];
|
||||
this->array[idx - 1] = temp;
|
||||
@ -247,8 +257,10 @@ void Vector_moveUp(Vector* this, int idx) {
|
||||
void Vector_moveDown(Vector* this, int idx) {
|
||||
assert(idx >= 0 && idx < this->items);
|
||||
assert(Vector_isConsistent(this));
|
||||
|
||||
if (idx == this->items - 1)
|
||||
return;
|
||||
|
||||
Object* temp = this->array[idx];
|
||||
this->array[idx] = this->array[idx + 1];
|
||||
this->array[idx + 1] = temp;
|
||||
@ -307,8 +319,9 @@ int Vector_indexOf(const Vector* this, const void* search_, Object_Compare compa
|
||||
for (int i = 0; i < this->items; i++) {
|
||||
const Object* o = this->array[i];
|
||||
assert(o);
|
||||
if (compare(search, o) == 0)
|
||||
if (compare(search, o) == 0) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@ -321,6 +334,7 @@ void Vector_splice(Vector* this, Vector* from) {
|
||||
int olditems = this->items;
|
||||
this->items += from->items;
|
||||
Vector_checkArraySize(this);
|
||||
for (int j = 0; j < from->items; j++)
|
||||
for (int j = 0; j < from->items; j++) {
|
||||
this->array[olditems + j] = from->array[j];
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user