fix: incorrect found index value size

This commit is contained in:
aZholtikov committed 2026-07-18 09:31:54 +03:00
1 parent b61ea6f80b
commit f46ab3f5fb
6 files changed
+187 -111

No files matched your search

+89 -51
View File
@@ -337,7 +337,8 @@ void app_main(void)
zh_vector_t *vector = NULL;
// Initialize vector for integers
esp_err_t ret = zh_vector_init(&vector, sizeof(int));
if (ret != ESP_OK) {
if (ret != ESP_OK)
{
printf("Vector initialization error\n");
return;
}
@@ -348,18 +349,23 @@ void app_main(void)
zh_vector_push_front(&vector, &val1);
zh_vector_push_back(&vector, &val2);
zh_vector_push_back(&vector, &val3);
size_t size;
uint16_t size = 0;
ret = zh_vector_get_size(&vector, &size);
if (ret == ESP_OK) {
if (ret == ESP_OK)
{
printf("Vector size: %zu\n", size);
}
// Access elements
for (int i = 0; i < size; i++) {
int item_value;
for (int i = 0; i < size; i++)
{
int item_value = 0;
esp_err_t err = zh_vector_get_item(&vector, (uint16_t)i, &item_value);
if (err == ESP_OK) {
if (err == ESP_OK)
{
printf("Element %d: %d\n", i, item_value);
} else {
}
else
{
printf("Error getting element %d: %s\n", i, esp_err_to_name(err));
}
}
@@ -380,7 +386,8 @@ void app_main(void)
```c
#include "zh_vector.h"
typedef struct {
typedef struct
{
int id;
char name[32];
float value;
@@ -392,7 +399,8 @@ void app_main(void)
zh_vector_t *vector = NULL;
// Initialize vector for structs
esp_err_t ret = zh_vector_init(&vector, sizeof(my_struct_t));
if (ret != ESP_OK) {
if (ret != ESP_OK)
{
printf("Vector initialization error\n");
return;
}
@@ -402,9 +410,10 @@ void app_main(void)
zh_vector_push_front(&vector, &item1);
zh_vector_push_back(&vector, &item2);
// Access and modify
my_struct_t item_value;
my_struct_t item_value = {0};
esp_err_t err = zh_vector_get_item(&vector, 0, &item_value);
if (err == ESP_OK) {
if (err == ESP_OK)
{
item_value.value = 10.5f;
zh_vector_change_item(&vector, 0, &item_value);
}
@@ -427,7 +436,8 @@ void app_main(void)
char buffer[100] = {0};
// Initialize vector for strings (100 char max)
esp_err_t ret = zh_vector_init(&vector, sizeof(buffer));
if (ret != ESP_OK) {
if (ret != ESP_OK)
{
printf("Vector initialization error\n");
return;
}
@@ -436,16 +446,21 @@ void app_main(void)
zh_vector_push_front(&vector, &buffer);
strcpy(buffer, "World");
zh_vector_push_back(&vector, &buffer);
size_t size;
uint16_t size = 0;
ret = zh_vector_get_size(&vector, &size);
if (ret == ESP_OK) {
if (ret == ESP_OK)
{
// Print all strings
for (int i = 0; i < size; i++) {
char str_value[100];
for (int i = 0; i < size; i++)
{
char str_value[100] = {0};
esp_err_t err = zh_vector_get_item(&vector, (uint16_t)i, str_value);
if (err == ESP_OK) {
if (err == ESP_OK)
{
printf("String %d: %s\n", i, str_value);
} else {
}
else
{
printf("Error getting string %d: %s\n", i, esp_err_to_name(err));
}
}
@@ -470,7 +485,8 @@ void app_main(void)
zh_vector_t *vector = NULL;
// Initialize vector for integers
esp_err_t ret = zh_vector_init(&vector, sizeof(int));
if (ret != ESP_OK) {
if (ret != ESP_OK)
{
printf("Vector initialization error\n");
return;
}
@@ -485,24 +501,30 @@ void app_main(void)
zh_vector_push_back(&vector, &val3);
zh_vector_push_back(&vector, &val4);
zh_vector_push_back(&vector, &val5);
uint16_t size;
uint16_t size = 0;
ret = zh_vector_get_size(&vector, &size);
if (ret == ESP_OK) {
if (ret == ESP_OK)
{
printf("Vector size before removing duplicates: %zu\n", size);
}
// Remove duplicates
zh_vector_remove_duplicates(&vector);
ret = zh_vector_get_size(&vector, &size);
if (ret == ESP_OK) {
if (ret == ESP_OK)
{
printf("Vector size after removing duplicates: %zu\n", size);
}
// Access remaining elements
for (int i = 0; i < size; i++) {
int item_value;
for (int i = 0; i < size; ++i)
{
int item_value = 0;
esp_err_t err = zh_vector_get_item(&vector, (uint16_t)i, &item_value);
if (err == ESP_OK) {
if (err == ESP_OK)
{
printf("Element %d: %d\n", i, item_value);
} else {
}
else
{
printf("Error getting element %d: %s\n", i, esp_err_to_name(err));
}
}
@@ -524,7 +546,8 @@ void app_main(void)
zh_vector_t *vector = NULL;
// Initialize vector for integers
esp_err_t ret = zh_vector_init(&vector, sizeof(int));
if (ret != ESP_OK) {
if (ret != ESP_OK)
{
printf("Vector initialization error\n");
return;
}
@@ -537,21 +560,27 @@ void app_main(void)
zh_vector_push_back(&vector, &val3);
// Find element
int search_item = 20;
int16_t found_index = -1;
int32_t found_index = -1;
ret = zh_vector_find_item(&vector, &search_item, &found_index);
if (ret == ESP_OK) {
printf("Element %d found at index %d\n", search_item, found_index);
} else {
printf("Element %d not found (index=%d)\n", search_item, found_index);
if (ret == ESP_OK)
{
printf("Element %d found at index %ld\n", search_item, found_index);
}
else
{
printf("Element %d not found (index=%ld)\n", search_item, found_index);
}
// Find non-existing element
search_item = 100;
found_index = -1;
ret = zh_vector_find_item(&vector, &search_item, &found_index);
if (ret == ESP_OK) {
printf("Element %d found at index %d\n", search_item, found_index);
} else {
printf("Element %d not found (index=%d)\n", search_item, found_index);
if (ret == ESP_OK)
{
printf("Element %d found at index %ld\n", search_item, found_index);
}
else
{
printf("Element %d not found (index=%ld)\n", search_item, found_index);
}
// Cleanup
zh_vector_free(&vector);
@@ -565,7 +594,8 @@ void app_main(void)
```c
#include "zh_vector.h"
typedef struct {
typedef struct
{
int id;
char name[32];
float value;
@@ -577,7 +607,8 @@ void app_main(void)
zh_vector_t *vector = NULL;
// Initialize vector for structs
esp_err_t ret = zh_vector_init(&vector, sizeof(my_struct_t));
if (ret != ESP_OK) {
if (ret != ESP_OK)
{
printf("Vector initialization error\n");
return;
}
@@ -590,29 +621,36 @@ void app_main(void)
zh_vector_push_back(&vector, &item3);
// Find struct by field value (searching by id field)
int search_id = 2;
int16_t found_index = -1;
int32_t found_index = -1;
// Calculate offset of 'id' field within the structure
my_struct_t sample;
my_struct_t sample = {0};
ret = zh_vector_find_item_in_field(&vector, &sample, &sample.id, sizeof(sample.id), &search_id, 0, &found_index);
if (ret == ESP_OK) {
printf("Struct with id=%d found at index %d\n", search_id, found_index);
if (ret == ESP_OK)
{
printf("Struct with id=%d found at index %ld\n", search_id, found_index);
// Get the found struct
my_struct_t found_item;
my_struct_t found_item = {0};
ret = zh_vector_get_item(&vector, (uint16_t)found_index, &found_item);
if (ret == ESP_OK) {
if (ret == ESP_OK)
{
printf("Found item: id=%d, name=%s, value=%.1f\n", found_item.id, found_item.name, found_item.value);
}
} else {
printf("Struct with id=%d not found (index=%d)\n", search_id, found_index);
}
else
{
printf("Struct with id=%d not found (index=%ld)\n", search_id, found_index);
}
// Find non-existing id
search_id = 100;
found_index = -1;
ret = zh_vector_find_item_in_field(&vector, &sample, &sample.id, sizeof(sample.id), &search_id, 0, &found_index);
if (ret == ESP_OK) {
printf("Struct with id=%d found at index %d\n", search_id, found_index);
} else {
printf("Struct with id=%d not found (index=%d)\n", search_id, found_index);
if (ret == ESP_OK)
{
printf("Struct with id=%d found at index %ld\n", search_id, found_index);
}
else
{
printf("Struct with id=%d not found (index=%ld)\n", search_id, found_index);
}
// Cleanup
zh_vector_free(&vector);
@@ -696,4 +734,4 @@ limitations under the License.
---
*Generated for zh_vector v2.4.0*
*Generated for zh_vector v2.4.1*