Fix cppcheck warnings, part 2

dokutan · Apr 24, 2021 · 98bb1fb · 98bb1fb
1 parent 107e90a
commit 98bb1fb
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 21 deletions.
diff --git a/include/generic/getters.cpp b/include/generic/getters.cpp
@@ -117,7 +117,7 @@ int mouse_generic::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m709/getters.cpp b/include/m709/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m709::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m711/getters.cpp b/include/m711/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m711::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m715/getters.cpp b/include/m715/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m715::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m719/getters.cpp b/include/m719/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m719::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m908/getters.cpp b/include/m908/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m908::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m913/getters.cpp b/include/m913/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m913::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m990/getters.cpp b/include/m990/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m990::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/m990chroma/getters.cpp b/include/m990chroma/getters.cpp
@@ -117,7 +117,7 @@ int mouse_m990chroma::get_macro( int number, std::string& macro ){
 		return 0;
 
 	std::vector< uint8_t > macro_bytes;
-	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), macro_bytes.begin() );
+	std::copy( _s_macro_data[number-1].begin(), _s_macro_data[number-1].end(), std::back_inserter(macro_bytes) );
 
 	_i_decode_macro( macro_bytes, output, "", 8 );
 	macro = output.str();

diff --git a/include/rd_mouse.cpp b/include/rd_mouse.cpp
@@ -323,10 +323,6 @@ int rd_mouse::_i_decode_macro( const std::vector< uint8_t >& macro_bytes, std::o
 
 		bool unknown_code = false;
 
-		// failsafe, i sometimes gets incremented by >1 which could lead to it being out of bounds
-		if( i >= macro_bytes.size() )
-			break;
-
 		// mouse buttons ( 0x81 = down, 0x01 = up )
 		if( macro_bytes[i] == 0x81 && macro_bytes[i+1] == 0x01 )
 			output << prefix << "down\tmouse_left\n";

diff --git a/include/rd_mouse.h b/include/rd_mouse.h
@@ -21,19 +21,21 @@
 #define RD_MOUSE
 
 #include <libusb.h>
-#include <map>
-#include <array>
-#include <string>
+
 #include <algorithm>
+#include <array>
 #include <exception>
-#include <regex>
 #include <fstream>
-#include <sstream>
-#include <utility>
-#include <iostream>
 #include <iomanip>
-#include <string>
+#include <iostream>
+#include <iterator>
+#include <map>
+#include <regex>
 #include <set>
+#include <sstream>
+#include <string>
+#include <string>
+#include <utility>
 #include <variant>
 
 /* These declarations exist to make it possible for mouse_variant