fix tests

1 files changed, 23 insertions, 23 deletions

diff --git a/tests/functional/sokol_spine_test.c b/tests/functional/sokol_spine_test.c
index 509fcf64..bf620fd4 100644
--- a/tests/functional/sokol_spine_test.c
+++ b/tests/functional/sokol_spine_test.c
@@ -9,20 +9,20 @@
 
 #define T(b) EXPECT_TRUE(b)
 
-static sspine_error last_error = SSPINE_ERROR_OK;
-static void log_func(const char* tag, uint32_t log_level, uint32_t error_code, const char* error_id, int line_nr, const char* filename, void* user_data) {
-    (void)tag; (void)log_level; (void)error_id; (void)line_nr; (void)filename; (void)user_data;
-    last_error = error_code;
+static sspine_log_item last_logitem = SSPINE_LOGITEM_OK;
+static void log_func(const char* tag, uint32_t log_level, uint32_t log_item, const char* message, int line_nr, const char* filename, void* user_data) {
+    (void)tag; (void)log_level; (void)message; (void)line_nr; (void)filename; (void)user_data;
+    last_logitem = log_item;
 }
 
 static void init() {
-    last_error = SSPINE_ERROR_OK;
+    last_logitem = SSPINE_LOGITEM_OK;
     sg_setup(&(sg_desc){0});
     sspine_setup(&(sspine_desc){ .logger = { .func = log_func } });
 }
 
 static void init_with_desc(const sspine_desc* desc) {
-    last_error = SSPINE_ERROR_OK;
+    last_logitem = SSPINE_LOGITEM_OK;
     sspine_desc desc1 = *desc;
     desc1.logger.func = log_func;
     sg_setup(&(sg_desc){0});
@@ -109,12 +109,12 @@ UTEST(sokol_spine, atlas_pool_exhausted) {
     for (int i = 0; i < 4; i++) {
         sspine_atlas atlas = sspine_make_atlas(&(sspine_atlas_desc){0});
         T(sspine_get_atlas_resource_state(atlas) == SSPINE_RESOURCESTATE_FAILED);
-        T(last_error == SSPINE_ERROR_ATLAS_DESC_NO_DATA);
+        T(last_logitem == SSPINE_LOGITEM_ATLAS_DESC_NO_DATA);
     }
     sspine_atlas atlas = sspine_make_atlas(&(sspine_atlas_desc){0});
     T(SSPINE_INVALID_ID == atlas.id);
     T(sspine_get_atlas_resource_state(atlas) == SSPINE_RESOURCESTATE_INVALID);
-    T(last_error == SSPINE_ERROR_ATLAS_POOL_EXHAUSTED);
+    T(last_logitem == SSPINE_LOGITEM_ATLAS_POOL_EXHAUSTED);
     shutdown();
 }
 
@@ -133,7 +133,7 @@ UTEST(sokol_spine, make_atlas_fail_no_data) {
     init();
     sspine_atlas atlas = sspine_make_atlas(&(sspine_atlas_desc){0});
     T(atlas.id != SSPINE_INVALID_ID);
-    T(last_error == SSPINE_ERROR_ATLAS_DESC_NO_DATA);
+    T(last_logitem == SSPINE_LOGITEM_ATLAS_DESC_NO_DATA);
     T(sspine_get_atlas_resource_state(atlas) == SSPINE_RESOURCESTATE_FAILED);
     T(!sspine_atlas_valid(atlas));
     shutdown();
@@ -143,7 +143,7 @@ UTEST(sokol_spine, make_atlas_fail_no_data) {
 UTEST(sokol_spine, failed_atlas_no_images) {
     init();
     sspine_atlas atlas = sspine_make_atlas(&(sspine_atlas_desc){0});
-    T(last_error == SSPINE_ERROR_ATLAS_DESC_NO_DATA);
+    T(last_logitem == SSPINE_LOGITEM_ATLAS_DESC_NO_DATA);
     T(atlas.id != SSPINE_INVALID_ID);
     T(!sspine_atlas_valid(atlas));
     T(sspine_num_images(atlas) == 0);
@@ -221,12 +221,12 @@ UTEST(sokol_spine, skeleton_pool_exhausted) {
     for (int i = 0; i < 4; i++) {
         sspine_skeleton skeleton = sspine_make_skeleton(&(sspine_skeleton_desc){0});
         T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_FAILED);
-        T(last_error == SSPINE_ERROR_SKELETON_DESC_NO_DATA);
+        T(last_logitem == SSPINE_LOGITEM_SKELETON_DESC_NO_DATA);
     }
     sspine_skeleton skeleton = sspine_make_skeleton(&(sspine_skeleton_desc){0});
     T(SSPINE_INVALID_ID == skeleton.id);
     T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_INVALID);
-    T(last_error == SSPINE_ERROR_SKELETON_POOL_EXHAUSTED);
+    T(last_logitem == SSPINE_LOGITEM_SKELETON_POOL_EXHAUSTED);
     shutdown();
 }
 
@@ -260,7 +260,7 @@ UTEST(sokol_spine, make_skeleton_fail_no_data) {
     });
     T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_FAILED);
     T(!sspine_skeleton_valid(skeleton));
-    T(last_error == SSPINE_ERROR_SKELETON_DESC_NO_DATA);
+    T(last_logitem == SSPINE_LOGITEM_SKELETON_DESC_NO_DATA);
     shutdown();
 }
 
@@ -273,19 +273,19 @@ UTEST(sokol_spine, make_skeleton_fail_no_atlas) {
     free_data(skeleton_json_data);
     T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_FAILED);
     T(!sspine_skeleton_valid(skeleton));
-    T(last_error == SSPINE_ERROR_SKELETON_DESC_NO_ATLAS);
+    T(last_logitem == SSPINE_LOGITEM_SKELETON_DESC_NO_ATLAS);
     shutdown();
 }
 
 UTEST(sokol_spine, make_skeleton_fail_with_failed_atlas) {
     init();
     sspine_atlas atlas = sspine_make_atlas(&(sspine_atlas_desc){0});
-    T(last_error == SSPINE_ERROR_ATLAS_DESC_NO_DATA);
+    T(last_logitem == SSPINE_LOGITEM_ATLAS_DESC_NO_DATA);
     T(sspine_get_atlas_resource_state(atlas) == SSPINE_RESOURCESTATE_FAILED);
     sspine_skeleton skeleton = create_skeleton_json(atlas);
     T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_FAILED);
     T(!sspine_skeleton_valid(skeleton));
-    T(last_error == SSPINE_ERROR_SKELETON_ATLAS_NOT_VALID);
+    T(last_logitem == SSPINE_LOGITEM_SKELETON_ATLAS_NOT_VALID);
     shutdown();
 }
 
@@ -298,7 +298,7 @@ UTEST(sokol_spine, make_skeleton_json_fail_corrupt_data) {
         .json_data = (const char*)invalid_json_data,
     });
     T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_FAILED);
-    T(last_error == SSPINE_ERROR_SPINE_SKELETON_DATA_CREATION_FAILED);
+    T(last_logitem == SSPINE_LOGITEM_SPINE_SKELETON_DATA_CREATION_FAILED);
     sspine_destroy_skeleton(skeleton);
     T(sspine_get_skeleton_resource_state(skeleton) == SSPINE_RESOURCESTATE_INVALID);
     shutdown();
@@ -328,12 +328,12 @@ UTEST(sokol_spine, instance_pool_exhausted) {
     for (int i = 0; i < 4; i++) {
         sspine_instance instance = sspine_make_instance(&(sspine_instance_desc){0});
         T(sspine_get_instance_resource_state(instance) == SSPINE_RESOURCESTATE_FAILED);
-        T(last_error == SSPINE_ERROR_INSTANCE_DESC_NO_SKELETON);
+        T(last_logitem == SSPINE_LOGITEM_INSTANCE_DESC_NO_SKELETON);
     }
     sspine_instance instance = sspine_make_instance(&(sspine_instance_desc){0});
     T(SSPINE_INVALID_ID == instance.id);
     T(sspine_get_instance_resource_state(instance) == SSPINE_RESOURCESTATE_INVALID);
-    T(last_error == SSPINE_ERROR_INSTANCE_POOL_EXHAUSTED);
+    T(last_logitem == SSPINE_LOGITEM_INSTANCE_POOL_EXHAUSTED);
     shutdown();
 }
 
@@ -354,7 +354,7 @@ UTEST(sokol_spine, make_instance_fail_no_skeleton) {
     init();
     sspine_instance instance = sspine_make_instance(&(sspine_instance_desc){0});
     T(sspine_get_instance_resource_state(instance) == SSPINE_RESOURCESTATE_FAILED);
-    T(last_error == SSPINE_ERROR_INSTANCE_DESC_NO_SKELETON);
+    T(last_logitem == SSPINE_LOGITEM_INSTANCE_DESC_NO_SKELETON);
     sspine_destroy_instance(instance);
     T(sspine_get_instance_resource_state(instance) == SSPINE_RESOURCESTATE_INVALID);
     shutdown();
@@ -363,13 +363,13 @@ UTEST(sokol_spine, make_instance_fail_no_skeleton) {
 UTEST(sokol_spine, make_instance_fail_with_failed_skeleton) {
     init();
     sspine_skeleton failed_skeleton = sspine_make_skeleton(&(sspine_skeleton_desc){0});
-    T(last_error == SSPINE_ERROR_SKELETON_DESC_NO_DATA);
+    T(last_logitem == SSPINE_LOGITEM_SKELETON_DESC_NO_DATA);
     T(sspine_get_skeleton_resource_state(failed_skeleton) == SSPINE_RESOURCESTATE_FAILED);
     sspine_instance instance = sspine_make_instance(&(sspine_instance_desc){
         .skeleton = failed_skeleton
     });
     T(sspine_get_instance_resource_state(instance) == SSPINE_RESOURCESTATE_FAILED);
-    T(last_error == SSPINE_ERROR_INSTANCE_SKELETON_NOT_VALID);
+    T(last_logitem == SSPINE_LOGITEM_INSTANCE_SKELETON_NOT_VALID);
     shutdown();
 }
 
@@ -385,7 +385,7 @@ UTEST(sokol_spine, make_instance_fail_with_destroyed_atlas) {
         .skeleton = skeleton
     });
     T(sspine_get_instance_resource_state(instance) == SSPINE_RESOURCESTATE_FAILED);
-    T(last_error == SSPINE_ERROR_INSTANCE_ATLAS_NOT_VALID);
+    T(last_logitem == SSPINE_LOGITEM_INSTANCE_ATLAS_NOT_VALID);
     shutdown();
 }