fixed gcc/clang errors

Author: kernelwernel

TODO.md

@@ -4,26 +4,20 @@
 - [ ] upload the lib to apt 
 - [ ] make a man file in markdown for the cli tool
 - [ ] implement techniques from here https://stackoverflow.com/questions/43026032/detect-running-on-virtual-machine
-- [ ] add a .clang_format thingy
 - [ ] make a medium post about it
 - [ ] check if bios date in /sys/class/dmi/id/ could be useful under QEMU
 - [ ] add a .so, .dll, and .dylib shared object files in the release 
-- [ ] fix the issue of VM::QEMU_USB being ultra slow in some edge-cases
 - [ ] /sys/class/dmi/id/product_name check this in qemu
-- [ ] add linux support for the hdd_serial_number technique
 - [ ] fix "dmidecode not found" error
 - [ ] fix /dev/mem not found in vbox default
 - [ ] update sourceforge
 - [ ] rearrange the techniques so that the more likely ones will be executed first
 - [ ] make a hardware scanner module where it'll find for VM strings in all sorts of devices
-- [ ] add more QEMU techniques
 - [ ] implement techniques from here https://www.cyberciti.biz/faq/linux-determine-virtualization-technology-command/
 - [ ] implement techniques from virt-what
 - [ ] https://cloud.google.com/compute/docs/instances/detect-compute-engine
-- [ ] update the updater.py script and fix it
 - [ ] @thereisnospoon this is where we need to start modifing the qemu source further by replacing vendor/device ids.
 https://www.pcilookup.com/
-- [ ] https://wasm.in/threads/testy-v-vmware.35315/#post-444576
 
 QEMU default: 0x1234
 Intel: 0x8086

src/vmaware.hpp

@@ -31,10 +31,10 @@
  * - struct for internal cpu operations        => line 743
  * - struct for internal memoization           => line 1214
  * - struct for internal utility functions     => line 1342
- * - struct for internal core components       => line 10173
+ * - struct for internal core components       => line 10175
  * - start of VM detection technique list      => line 2429
- * - start of public VM detection functions    => line 10841
- * - start of externally defined variables     => line 11784
+ * - start of public VM detection functions    => line 10843
+ * - start of externally defined variables     => line 11786
  *
  *
  * ============================== EXAMPLE ===================================
@@ -7955,7 +7955,7 @@ struct VM {
                 }
             }
             return (tscIssueCount >= tscIterations / 2);
-            }();
+        }();
 
     #if (WINDOWS)
        SetThreadAffinityMask(GetCurrentThread(), procMask);
@@ -8173,7 +8173,9 @@ struct VM {
                 overlap = chunk;
             }
 
-            for (size_t i = 0; i < patterns.size(); ++i) {
+            #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+            for (size_t i = 0; i < ARRAY_SIZE(patterns); ++i) {
                 if (!seen[i] && chunk.find(patterns[i]) != std::string::npos) {
                     debug("LSHW_QEMU: found ", patterns[i]);
                     seen[i] = true;

src/vmaware_MIT.hpp

@@ -53,10 +53,10 @@
  * - struct for internal cpu operations        => line 758
  * - struct for internal memoization           => line 1229
  * - struct for internal utility functions     => line 1357
- * - struct for internal core components       => line 9961
+ * - struct for internal core components       => line 9963
  * - start of VM detection technique list      => line 2444
- * - start of public VM detection functions    => line 10629
- * - start of externally defined variables     => line 11565
+ * - start of public VM detection functions    => line 10631
+ * - start of externally defined variables     => line 11567
  *
  *
  * ============================== EXAMPLE ===================================
@@ -7743,7 +7743,7 @@ struct VM {
                 }
             }
             return (tscIssueCount >= tscIterations / 2);
-            }();
+        }();
 
     #if (WINDOWS)
        SetThreadAffinityMask(GetCurrentThread(), procMask);
@@ -7961,7 +7961,9 @@ struct VM {
                 overlap = chunk;
             }
 
-            for (size_t i = 0; i < patterns.size(); ++i) {
+            #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+            for (size_t i = 0; i < ARRAY_SIZE(patterns); ++i) {
                 if (!seen[i] && chunk.find(patterns[i]) != std::string::npos) {
                     debug("LSHW_QEMU: found ", patterns[i]);
                     seen[i] = true;