Changeset 1314 for cpp/frams

Timestamp:

07/11/24 17:22:23 (6 months ago)

Author:

Maciej Komosinski

Message:

Added realloc() implementation that behaves like free() when size==0 - consistently on all platforms, in contrast to standard realloc()

Location:

cpp/frams

Files:

• Makefile-SDK (modified) (1 diff)
• Makefile-SDK-files (modified) (1 diff)
• util/list.h (modified) (4 diffs)
• util/sstring-simple.cpp (modified) (2 diffs)

cpp/frams/Makefile-SDK

@@ -9 +9 @@
 sdk_tests: $(SDK_TESTS)
 
-CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -Werror=return-type
+CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -Wno-invalid-offsetof -Werror=return-type
 
 SDK_BUILD_CONFIG= -include frams/config/sdk-build-config.h

cpp/frams/Makefile-SDK-files

@@ -41 +41 @@
 NN_LAYOUT_OBJS=frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
 
-SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/param/paramlist.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/util-string.o common/util-file.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o common/virtfile/stdinoutfilesystem.o $(PRINTFLOAT_OBJS)
+SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/param/paramlist.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/util-string.o common/util-file.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o common/virtfile/stdinoutfilesystem.o common/realloc-free0size.o $(PRINTFLOAT_OBJS)
 
 STDOUT_LOGGER_OBJS=common/virtfile/virtfile.o common/loggers/loggertostdout.o common/console.o 

cpp/frams/util/list.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -9 +9 @@
 #include <string.h>
 #include <common/nonstd.h>
+#include <common/realloc-free0size.h>
 
 //#define SLISTSTATS
@@ -44 +45 @@
                 if (mem || x)
                 {
-                        mem = (T*)realloc(mem, x*sizeof(T));
+                        mem = (T*)realloc_free0size(mem, x*sizeof(T));
 #ifdef SLISTSTATS
                         SListStats::stats.allocations++;
                         SListStats::stats.copied += sizeof(T)*min(x, have);
-#endif  
+#endif
                 }
                 have = x;
@@ -150 +151 @@
         {
                 setSize(src.size());
-                memcpy(mem, src.mem, src.size()*sizeof(T));
+                if (mem != NULL)
+                        memcpy(mem, src.mem, src.size()*sizeof(T));
         }
         void operator+=(const SListTempl<T>&src) ///< append src contents

cpp/frams/util/sstring-simple.cpp

@@ -3 +3 @@
 #include <assert.h>
 #include <common/nonstd_math.h>
+#include <common/realloc-free0size.h>
 
 #ifdef __ANDROID__
@@ -52 +53 @@
 {
         if (newsize == allocated) return;
-        txt = (char*)realloc(txt, newsize);
+        txt = (char*)realloc_free0size(txt, newsize);
         allocated = newsize;
 }