Merge pull request #3331

Fix class initializations and suppress duplicate inherited update() message
LinuxCNC · Feb 26, 2025 · a4c72e9 · a4c72e9
2 parents db07887 + bd56da8
commit a4c72e9
Show file tree

Hide file tree

Showing 33 changed files with 1,160 additions and 649 deletions.
diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
@@ -13,10 +13,15 @@ fi
 # See if cppcheck accepts --check-level
 EXHAUSTIVE=$(cppcheck --check-level=exhaustive --version > /dev/null 2>&1 && echo "--check-level=exhaustive")
 
-CPPCHKOPT=( -j "$nproc" --force "$EXHAUSTIVE" )
+CPPCHKOPT=( -j "$nproc" --force "$EXHAUSTIVE" --inline-suppr )
 CPPCHKOPT+=( "--enable=warning,performance,portability" )
 CPPCHKOPT+=( "-I$(realpath "$(dirname "$0")/../include")" )
 
+if [ -n "$CPPCHECK_OPTS" ]; then
+    read -r -a OPTS <<< "$CPPCHECK_OPTS"
+    CPPCHKOPT+=( "${OPTS[@]}" )
+fi
+
 # Even cppcheck 2.3 (debian 11) supports c++17 (undocumented)
 CCSTD=( --std=c11 --language=c )
 CXSTD=( --std=c++17 --language=c++ )

diff --git a/src/emc/canterp/canterp.cc b/src/emc/canterp/canterp.cc
@@ -67,7 +67,7 @@ static char the_command_args[LINELEN] = { 0 };	// just the args part
 
 class Canterp : public InterpBase {
 public:
-    Canterp () : f(0) {}
+    Canterp () : f(0), filename{} {}
     char *error_text(int errcode, char *buf, size_t buflen) override;
     char *stack_name(int index, char *buf, size_t buflen) override;
     char *line_text(char *buf, size_t buflen) override;

diff --git a/src/emc/nml_intf/canon.hh b/src/emc/nml_intf/canon.hh
@@ -150,7 +150,28 @@ typedef struct {
 } CanonSpindle_t;
 
 typedef struct CanonConfig_t {
-    CanonConfig_t() : rotary_unlock_for_traverse(-1) {}
+    CanonConfig_t()
+        : xy_rotation(0.0),
+          rotary_unlock_for_traverse(-1),
+          g5xOffset{},
+          g92Offset{},
+          endPoint{},
+          lengthUnits(CANON_UNITS_INCHES),
+          activePlane(CANON_PLANE::XY),
+          toolOffset{},
+          motionMode(CANON_EXACT_STOP),
+          motionTolerance(0.0),
+          naivecamTolerance(0.0),
+          feed_mode(0),
+          spindle_num(0),
+          spindle{},
+          linearFeedRate(0.0),
+          angularFeedRate(0.0),
+          optional_program_stop(false),
+          block_delete(false),
+          cartesian_move(0),
+          angular_move(0)
+    {}
 
     double xy_rotation;
     int rotary_unlock_for_traverse; // jointnumber or -1