push for windows
This commit is contained in:
@@ -16,7 +16,6 @@ int addAnimal(const Animal* animalPtr, Animal* animalArray, size_t animalArrayLe
|
||||
}
|
||||
|
||||
int removeAnimal(int animalId, Animal* animalArray, size_t numberOfAnimalsPresent, size_t* newNumberOfAnimalsPresent){
|
||||
int fault = 0;
|
||||
size_t removedCount = 0;
|
||||
|
||||
if (animalArray == NULL || numberOfAnimalsPresent == 0) {
|
||||
@@ -35,26 +34,18 @@ int removeAnimal(int animalId, Animal* animalArray, size_t numberOfAnimalsPresen
|
||||
}
|
||||
}
|
||||
}
|
||||
fault = removedCount;
|
||||
*newNumberOfAnimalsPresent = (numberOfAnimalsPresent - removedCount);
|
||||
return fault;
|
||||
return removedCount;
|
||||
}
|
||||
|
||||
int findAnimalById(int animalId, const Animal* animalArray, size_t numberOfAnimalsPresent, Animal* foundAnimal) {
|
||||
int fault = -1;
|
||||
if (animalArray == NULL || numberOfAnimalsPresent == 0 || foundAnimal == NULL) {
|
||||
fault = -1;
|
||||
} else {
|
||||
for (size_t i = 0; i < numberOfAnimalsPresent; i++) {
|
||||
if (animalArray[i].Id == animalId) {
|
||||
*foundAnimal = animalArray[i];
|
||||
fault = 0;
|
||||
break; // Exit loop after finding the animal
|
||||
}
|
||||
}
|
||||
if (fault == -1) { // Only zero out if animal wasn't found
|
||||
memset(foundAnimal, 0, sizeof(Animal));
|
||||
if (animalArray == NULL || foundAnimal == NULL) return -1; // Invalid input
|
||||
|
||||
for (size_t i = 0; i < numberOfAnimalsPresent; i++) {
|
||||
if (animalArray[i].Id == animalId) {
|
||||
*foundAnimal = animalArray[i];
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return fault;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user