Changeset 1315 for cpp/frams/param/param.cpp

Timestamp:

07/11/24 17:26:06 (10 months ago)

Author:

Maciej Komosinski

Message:

Offset of fields within an object: replaced subtraction of pointers/addresses with the official offsetof()

File:

• cpp/frams/param/param.cpp (modified) (6 diffs)

cpp/frams/param/param.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -21 +21 @@
 #define SAVE_SELECTED_NAMES
 #define WARN_MISSING_NAME
-
-char MakeCodeGuardHappy;
 
 ParamEntry empty_paramtab[] =
@@ -559 +557 @@
         const char* fname = f->VgetPath();
         if (fname != NULL)
-                {
+        {
                 fileinfo = SString::sprintf(" while reading from '%s'", fname);
                 if (options.linenum)
                         fileinfo += SString::sprintf(" (line %d)", *options.linenum);
-                }
+        }
         return fileinfo;
 }
@@ -613 +611 @@
                         if (seen[i])
                         {
-                                SString fileinfo = getFileMessageFor(f,options);
+                                SString fileinfo = getFileMessageFor(f, options);
                                 logPrintf("ParamInterface", "load", LOG_WARN, "Multiple '%s.%s' properties found%s", getName(), id(i), fileinfo.c_str());
                         }
@@ -622 +620 @@
                                 if (p0[p_len + 1] == '~')
                                 {
-                                        if (p0[p_len+2])
+                                        if (p0[p_len + 2])
                                         {
-                                                SString fileinfo = getFileMessageFor(f,options);
-                                                logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected characters after '~': '%s' in '%s:'%s", p0+p_len+1, id(i), fileinfo.c_str());
+                                                SString fileinfo = getFileMessageFor(f, options);
+                                                logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected characters after '~': '%s' in '%s:'%s", p0 + p_len + 1, id(i), fileinfo.c_str());
                                         }
-                                
+
                                         SString s;
                                         if (!readUntilTilde(f, s))
@@ -939 +937 @@
         {
         case 'd': t += "integer";
-        {paInt a, b, c; int n = getMinMaxIntFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %d..%d", a, b); if (n >= 3) t += SString::sprintf(" (default %d)", c); }
+        { paInt a, b, c; int n = getMinMaxIntFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %d..%d", a, b); if (n >= 3) t += SString::sprintf(" (default %d)", c); }
         break;
         case 'f': t += "float";
-        {double a, b, c; int n = getMinMaxDoubleFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %g..%g", a, b); if (n >= 3) t += SString::sprintf(" (default %g)", c); }
+        { double a, b, c; int n = getMinMaxDoubleFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %g..%g", a, b); if (n >= 3) t += SString::sprintf(" (default %g)", c); }
         break;
         case 's': t += "string";
-        {int a, b; SString c; int n = getMinMaxStringFromTypeDef(type, a, b, c); if ((n >= 2) && (b > 0)) t += SString::sprintf(", max %d chars", b); if (n >= 3) t += SString::sprintf(" (default \"%s\")", c.c_str()); }
+        { int a, b; SString c; int n = getMinMaxStringFromTypeDef(type, a, b, c); if ((n >= 2) && (b > 0)) t += SString::sprintf(", max %d chars", b); if (n >= 3) t += SString::sprintf(" (default \"%s\")", c.c_str()); }
         break;
         case 'x': t += "untyped value"; break;