Fix arduino#217 issue with compiling with newer compiler

jboynes · jboynes · commit 21eb9650ab67 · 2023-11-03T09:29:27.000Z
diff --git a/api/CanMsg.h b/api/CanMsg.h
@@ -51,12 +51,7 @@ class CanMsg : public Printable
 
   CanMsg() : CanMsg(0, 0, nullptr) { }
 
-  CanMsg(CanMsg const & other)
-  {
-    this->id          = other.id;
-    this->data_length = other.data_length;
-    if (this->data_length && other.data)
-      memcpy(this->data, other.data, this->data_length);
+  CanMsg(CanMsg const & other) : CanMsg(other.id, other.data_length, other.data) {
   }
 
   virtual ~CanMsg() { }
@@ -65,10 +60,10 @@ class CanMsg : public Printable
   {
     if (this != &other)
     {
-      this->id          = other.id;
-      this->data_length = other.data_length;
-      if (this->data_length && other.data)
-        memcpy(this->data, other.data, this->data_length);
+      id          = other.id;
+      data_length = other.data_length;
+      if (data_length > 0)
+        memcpy(data, other.data, data_length);
     }
     return (*this);
   }

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,7 @@ class CanMsg : public Printable`
`51`	`51`
`52`	`52`	`CanMsg() : CanMsg(0, 0, nullptr) { }`
`53`	`53`
`54`		`- CanMsg(CanMsg const & other)`
`55`		`- {`
`56`		`- this->id = other.id;`
`57`		`- this->data_length = other.data_length;`
`58`		`- if (this->data_length && other.data)`
`59`		`- memcpy(this->data, other.data, this->data_length);`
	`54`	`+ CanMsg(CanMsg const & other) : CanMsg(other.id, other.data_length, other.data) {`
`60`	`55`	`}`
`61`	`56`
`62`	`57`	`virtual ~CanMsg() { }`
`@@ -65,10 +60,10 @@ class CanMsg : public Printable`
`65`	`60`	`{`
`66`	`61`	`if (this != &other)`
`67`	`62`	`{`
`68`		`- this->id = other.id;`
`69`		`- this->data_length = other.data_length;`
`70`		`- if (this->data_length && other.data)`
`71`		`- memcpy(this->data, other.data, this->data_length);`
	`63`	`+ id = other.id;`
	`64`	`+ data_length = other.data_length;`
	`65`	`+ if (data_length > 0)`
	`66`	`+ memcpy(data, other.data, data_length);`
`72`	`67`	`}`
`73`	`68`	`return (*this);`
`74`	`69`	`}`