zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mark Vector parameter const for non-modifying functions

This commit is contained in:
Christian Göttsche 2020-10-15 20:41:35 +02:00 committed by cgzones
parent 3c08fa3c63
commit 846fe8a71f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Vector.c
View File

@ -40,7 +40,7 @@ void Vector_delete(Vector* this) {
#ifndef NDEBUG #ifndef NDEBUG
static bool Vector_isConsistent(Vector* this) { static bool Vector_isConsistent(const Vector* this) {
assert(this->items <= this->arraySize); assert(this->items <= this->arraySize);
if (this->owner) { if (this->owner) {
for (int i = 0; i < this->items; i++) for (int i = 0; i < this->items; i++)
@ -52,7 +52,7 @@ static bool Vector_isConsistent(Vector* this) {
} }
} }
int Vector_count(Vector* this) { int Vector_count(const Vector* this) {
int items = 0; int items = 0;
for (int i = 0; i < this->items; i++) { for (int i = 0; i < this->items; i++) {
if (this->array[i]) if (this->array[i])
@ -68,7 +68,7 @@ Object* Vector_get(Vector* this, int idx) {
return this->array[idx]; return this->array[idx];
} }
int Vector_size(Vector* this) { int Vector_size(const Vector* this) {
assert(Vector_isConsistent(this)); assert(Vector_isConsistent(this));
return this->items; return this->items;
} }
@ -288,13 +288,13 @@ void Vector_add(Vector* this, void* data_) {
assert(Vector_isConsistent(this)); assert(Vector_isConsistent(this));
} }
int Vector_indexOf(Vector* this, const void* search_, Object_Compare compare) { int Vector_indexOf(const Vector* this, const void* search_, Object_Compare compare) {
const Object* search = search_; const Object* search = search_;
assert(Object_isA(search, this->type)); assert(Object_isA(search, this->type));
assert(compare); assert(compare);
assert(Vector_isConsistent(this)); assert(Vector_isConsistent(this));
for (int i = 0; i < this->items; i++) { for (int i = 0; i < this->items; i++) {
Object* o = this->array[i]; const Object* o = this->array[i];
assert(o); assert(o);
if (compare(search, o) == 0) if (compare(search, o) == 0)
return i; return i;

6
Vector.h
View File

@ -49,8 +49,8 @@ void Vector_set(Vector* this, int idx, void* data_);
#ifndef NDEBUG #ifndef NDEBUG
Object* Vector_get(Vector* this, int idx); Object* Vector_get(Vector* this, int idx);
int Vector_size(Vector* this); int Vector_size(const Vector* this);
int Vector_count(Vector* this); int Vector_count(const Vector* this);
#else /* NDEBUG */ #else /* NDEBUG */
@ -61,7 +61,7 @@ int Vector_count(Vector* this);
void Vector_add(Vector* this, void* data_); void Vector_add(Vector* this, void* data_);
int Vector_indexOf(Vector* this, const void* search_, Object_Compare compare); int Vector_indexOf(const Vector* this, const void* search_, Object_Compare compare);
void Vector_splice(Vector* this, Vector* from); void Vector_splice(Vector* this, Vector* from);