avr_libraries/zh_avr_vector
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: changed error check

Browse Source
This commit is contained in:
Alexey Zholtikov
2025-08-02 20:37:03 +03:00
parent 516986f3db
commit 8597685a51
1 changed files with 21 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
zh_avr_vector.c
View File

@@ -1,17 +1,17 @@
#include "zh_avr_vector.h" #include "zh_avr_vector.h"
#define ZH_ERROR_CHECK(cond, err, ...) \
if (!(cond)) \
{ \
return err; \
}
static avr_err_t _resize(zh_avr_vector_t *vector, uint16_t capacity); static avr_err_t _resize(zh_avr_vector_t *vector, uint16_t capacity);
avr_err_t zh_avr_vector_init(zh_avr_vector_t *vector, uint16_t unit) avr_err_t zh_avr_vector_init(zh_avr_vector_t *vector, uint16_t unit)
{ {
if (vector == NULL || unit == 0) ZH_ERROR_CHECK((vector != NULL || unit != 0), AVR_ERR_INVALID_ARG);
{ ZH_ERROR_CHECK(vector->status != true, AVR_ERR_INVALID_STATE);
return AVR_ERR_INVALID_ARG;
}
if (vector->status == true)
{
return AVR_ERR_INVALID_STATE;
}
vector->capacity = 0; vector->capacity = 0;
vector->size = 0; vector->size = 0;
vector->unit = unit; vector->unit = unit;
@@ -21,14 +21,8 @@ avr_err_t zh_avr_vector_init(zh_avr_vector_t *vector, uint16_t unit)
avr_err_t zh_avr_vector_free(zh_avr_vector_t *vector) avr_err_t zh_avr_vector_free(zh_avr_vector_t *vector)
{ {
if (vector == NULL) ZH_ERROR_CHECK(vector != NULL, AVR_ERR_INVALID_ARG);
{ ZH_ERROR_CHECK(vector->status != false, AVR_ERR_INVALID_STATE);
return AVR_ERR_INVALID_ARG;
}
if (vector->status == false)
{
return AVR_ERR_INVALID_STATE;
}
for (uint16_t i = 0; i < vector->size; ++i) for (uint16_t i = 0; i < vector->size; ++i)
{ {
free(vector->items[i]); free(vector->items[i]);
@@ -39,49 +33,28 @@ avr_err_t zh_avr_vector_free(zh_avr_vector_t *vector)
avr_err_t zh_avr_vector_get_size(zh_avr_vector_t *vector) avr_err_t zh_avr_vector_get_size(zh_avr_vector_t *vector)
{ {
if (vector == NULL || vector->status == false) ZH_ERROR_CHECK((vector != NULL || vector->status != false), AVR_FAIL);
{
return AVR_FAIL;
}
return vector->size; return vector->size;
} }
avr_err_t zh_avr_vector_push_back(zh_avr_vector_t *vector, void *item) avr_err_t zh_avr_vector_push_back(zh_avr_vector_t *vector, void *item)
{ {
if (vector == NULL || item == NULL) ZH_ERROR_CHECK((vector != NULL || item != NULL), AVR_ERR_INVALID_ARG);
{ ZH_ERROR_CHECK(vector->status != false, AVR_ERR_INVALID_STATE);
return AVR_ERR_INVALID_ARG;
}
if (vector->status == false)
{
return AVR_ERR_INVALID_STATE;
}
if (vector->capacity == vector->size) if (vector->capacity == vector->size)
{ {
if (_resize(vector, vector->capacity + 1) == AVR_ERR_NO_MEM) ZH_ERROR_CHECK((_resize(vector, vector->capacity + 1) != AVR_ERR_NO_MEM), AVR_ERR_NO_MEM);
{
return AVR_ERR_NO_MEM;
}
} }
vector->items[vector->size] = calloc(1, vector->unit); vector->items[vector->size] = calloc(1, vector->unit);
if (vector->items[vector->size] == NULL) ZH_ERROR_CHECK(vector->items[vector->size] != NULL, AVR_ERR_NO_MEM);
{
return AVR_ERR_NO_MEM;
}
memcpy(vector->items[vector->size++], item, vector->unit); memcpy(vector->items[vector->size++], item, vector->unit);
return AVR_OK; return AVR_OK;
} }
avr_err_t zh_avr_vector_change_item(zh_avr_vector_t *vector, uint16_t index, void *item) avr_err_t zh_avr_vector_change_item(zh_avr_vector_t *vector, uint16_t index, void *item)
{ {
if (vector == NULL || item == NULL) ZH_ERROR_CHECK((vector != NULL || item != NULL), AVR_ERR_INVALID_ARG);
{ ZH_ERROR_CHECK(vector->status != false, AVR_ERR_INVALID_STATE);
return AVR_ERR_INVALID_ARG;
}
if (vector->status == false)
{
return AVR_ERR_INVALID_STATE;
}
if (index < vector->size) if (index < vector->size)
{ {
memcpy(vector->items[index], item, vector->unit); memcpy(vector->items[index], item, vector->unit);
@@ -92,14 +65,7 @@ avr_err_t zh_avr_vector_change_item(zh_avr_vector_t *vector, uint16_t index, voi
void *zh_avr_vector_get_item(zh_avr_vector_t *vector, uint16_t index) void *zh_avr_vector_get_item(zh_avr_vector_t *vector, uint16_t index)
{ {
if (vector == NULL) ZH_ERROR_CHECK((vector != NULL || vector->status != false), NULL);
{
return NULL;
}
if (vector->status == false)
{
return NULL;
}
if (index < vector->size) if (index < vector->size)
{ {
void *item = vector->items[index]; void *item = vector->items[index];
@@ -113,14 +79,8 @@ void *zh_avr_vector_get_item(zh_avr_vector_t *vector, uint16_t index)
avr_err_t zh_avr_vector_delete_item(zh_avr_vector_t *vector, uint16_t index) avr_err_t zh_avr_vector_delete_item(zh_avr_vector_t *vector, uint16_t index)
{ {
if (vector == NULL) ZH_ERROR_CHECK(vector != NULL, AVR_ERR_INVALID_ARG);
{ ZH_ERROR_CHECK(vector->status != false, AVR_ERR_INVALID_STATE);
return AVR_ERR_INVALID_ARG;
}
if (vector->status == false)
{
return AVR_ERR_INVALID_STATE;
}
if (index < vector->size) if (index < vector->size)
{ {
free(vector->items[index]); free(vector->items[index]);
@@ -141,10 +101,7 @@ static avr_err_t _resize(zh_avr_vector_t *vector, uint16_t capacity)
if (capacity != 0) if (capacity != 0)
{ {
vector->items = realloc(vector->items, sizeof(void *) * capacity); vector->items = realloc(vector->items, sizeof(void *) * capacity);
if (vector->items == NULL) ZH_ERROR_CHECK(vector->items != NULL, AVR_ERR_NO_MEM);
{
return AVR_ERR_NO_MEM;
}
} }
vector->capacity = capacity; vector->capacity = capacity;
return AVR_OK; return AVR_OK;