arduino
diff --git a/‎api/CanMsg.h
Copy file name to clipboardExpand all lines: api/CanMsg.h
+8-8Lines changed: 8 additions & 8 deletions b/‎api/CanMsg.h
Copy file name to clipboardExpand all lines: api/CanMsg.h
+8-8Lines changed: 8 additions & 8 deletions
@@ -53,10 +53,10 @@ class CanMsg : public Printable
 
   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);
+    id          = other.id;
+    data_length = other.data_length;
+    if (data_length > 0)
+      memcpy(data, other.data, data_length);
   }
 
   virtual ~CanMsg() { }
@@ -65,10 +65,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
`@@ -53,10 +53,10 @@ class CanMsg : public Printable`
`53`	`53`
`54`	`54`	`CanMsg(CanMsg const & other)`
`55`	`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);`
	`56`	`+ id = other.id;`
	`57`	`+ data_length = other.data_length;`
	`58`	`+ if (data_length > 0)`
	`59`	`+ memcpy(data, other.data, data_length);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`virtual ~CanMsg() { }`
`@@ -65,10 +65,10 @@ class CanMsg : public Printable`
`65`	`65`	`{`
`66`	`66`	`if (this != &other)`
`67`	`67`	`{`
`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);`
	`68`	`+ id = other.id;`
	`69`	`+ data_length = other.data_length;`
	`70`	`+ if (data_length > 0)`
	`71`	`+ memcpy(data, other.data, data_length);`
`72`	`72`	`}`
`73`	`73`	`return (*this);`
`74`	`74`	`}`