Update to version 1.0.1

HubTou · Nov 5, 2022 · 60c220d · 60c220d
1 parent 240276e
commit 60c220d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -2,7 +2,7 @@ LIBRARY=pylists4c
 
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_VERSION=0
+PATCH_VERSION=1
 
 LIB=lib$(LIBRARY).a
 SOLIB=lib$(LIBRARY).so

diff --git a/src/debug.c b/src/debug.c
@@ -5,6 +5,9 @@
 #include <pylists4c.h>
 #include "global.h"
 
+#define MAX_NAME_SIZE 80
+#define BUFFER_SIZE (MAX_NAME_SIZE + 22) // 22 = '[' + 19 digits 64 bits long + ']' + '\0'
+
 /******************************************************************************/
 // FUNCTION: listDebug()
 //     Prints all LIST details to stderr
@@ -16,7 +19,7 @@ EXPORT void listDebug(LIST* pList, STRING name)
 {
     LIST* pElement = NULL;
     long i = 0;
-    char subname[1024];
+    char subname[BUFFER_SIZE];
     char* pCharacter;
 
     pElement = pList;
@@ -56,9 +59,9 @@ EXPORT void listDebug(LIST* pList, STRING name)
             case ETYPE_LIST:
                 fprintf(stderr, "%s (%s, %zu byte%s) --> @%p\n", (pElement -> pValue)?"see below":"[]", "LIST*", pElement -> size, (pElement -> size > 1)?"s":"", pElement -> pNext);
                 if (name == NULL)
-                    snprintf(subname, 1024, "list[%ld]", i);
+                    snprintf(subname, BUFFER_SIZE, "list[%ld]", i);
                 else
-                    snprintf(subname, 1024, "%s[%ld]", name, i);
+                    snprintf(subname, BUFFER_SIZE, "%.*s[%ld]", MAX_NAME_SIZE, name, i);
                 listDebug(pElement -> pValue, subname);
                 break;
             case ETYPE_STRUCT: listDebugStruct(pElement -> pValue, pElement -> size); break;

diff --git a/src/types/Struct.c b/src/types/Struct.c
@@ -12,6 +12,8 @@ void (*listStringStruct)(STRING buffer, void* pStruct, size_t size) = listString
 void (*listPrintStruct)(void* pStruct, size_t size) = listPrintStructByDefault;
 void (*listDebugStruct)(void* pStruct, size_t size) = listDebugStructByDefault;
 
+#define BUFFER_SIZE 4
+
 /******************************************************************************/
 // FUNCTION: listSetStructSize()
 //     Sets the size of a STRUCT you want to compare
@@ -64,7 +66,7 @@ EXPORT int listCompareStructReversed(const void *p1, const void *p2)
 /******************************************************************************/
 EXPORT void listStringStructByDefault(STRING buffer, void* pStruct, size_t size)
 {
-    char hexa[4];
+    char hexa[BUFFER_SIZE]; // 2 hexadecimal digits + ' ' + '\0'
 
     buffer[0] = 0;
     for (size_t i = 0; i < size; i++)
@@ -73,7 +75,7 @@ EXPORT void listStringStructByDefault(STRING buffer, void* pStruct, size_t size)
 #if ! (defined(_WIN32) || defined(_WIN64) )
         strcat(buffer, hexa);
 #else
-        strcat_s(buffer, 4, hexa);
+        strcat_s(buffer, BUFFER_SIZE, hexa);
 #endif
     }
 }