Small consistency fixes

x64_dbg_dbg/_dbgfunctions.cpp

@@ -53,17 +53,14 @@ static bool _sectionfromaddr(duint addr, char* section)
 
 static bool _patchget(duint addr)
 {
-    return PatchGet(addr, 0);
+    return PatchGet(addr, nullptr);
 }
 
 static bool _patchinrange(duint start, duint end)
 {
     if(start > end)
-    {
-        duint a = start;
-        start = end;
-        end = a;
-    }
+		std::swap(start, end);
+
     for(duint i = start; i < end + 1; i++)
         if(_patchget(i))
             return true;
@@ -77,12 +74,9 @@ static bool _mempatch(duint va, const unsigned char* src, duint size)
 
 static void _patchrestorerange(duint start, duint end)
 {
-    if(start > end)
-    {
-        duint a = start;
-        start = end;
-        end = a;
-    }
+	if (start > end)
+		std::swap(start, end);
+
     for(duint i = start; i < end + 1; i++)
         PatchDelete(i, true);
     GuiUpdatePatches();
@@ -120,7 +114,7 @@ static bool _getcmdline(char* cmd_line, size_t* cbsize)
 
 static bool _setcmdline(const char* cmd_line)
 {
-    return dbgsetcmdline(cmd_line, NULL);
+    return dbgsetcmdline(cmd_line, nullptr);
 }
 
 static bool _getjit(char* jit, bool jit64)

x64_dbg_dbg/label.cpp

@@ -40,7 +40,7 @@ bool LabelSet(uint Address, const char* Text, bool Manual)
 	EXCLUSIVE_ACQUIRE(LockLabels);
 
 	// Insert label by key
-	uint key = ModHashFromAddr(Address);
+	const uint key = ModHashFromAddr(Address);
 
     if(!labels.insert(std::make_pair(ModHashFromAddr(key), labelInfo)).second)
         labels[key] = labelInfo;

x64_dbg_dbg/memory.cpp

@@ -224,7 +224,7 @@ bool MemWrite(void* BaseAddress, void* Buffer, SIZE_T Size, SIZE_T* NumberOfByte
     // Try a regular WriteProcessMemory call
     bool ret = MemoryWriteSafe(fdProcessInfo->hProcess, BaseAddress, Buffer, Size, NumberOfBytesWritten);
 
-    if(ret && * NumberOfBytesWritten == Size)
+    if(ret && *NumberOfBytesWritten == Size)
         return true;
 
 	// Write page-by-page (Skip if only 1 page exists)
@@ -285,7 +285,7 @@ bool MemPatch(void* BaseAddress, void* Buffer, SIZE_T Size, SIZE_T* NumberOfByte
 bool MemIsValidReadPtr(uint Address)
 {
     unsigned char a = 0;
-    return MemRead((void*)Address, &a, 1, nullptr);
+    return MemRead((void*)Address, &a, sizeof(unsigned char), nullptr);
 }
 
 bool MemIsCanonicalAddress(uint Address)

x64_dbg_dbg/patches.cpp

@@ -28,7 +28,7 @@ bool PatchSet(uint Address, unsigned char OldByte, unsigned char NewByte)
 	ModNameFromAddr(Address, newPatch.mod, true);
 
 	// Generate a key for this address
-    uint key = ModHashFromAddr(Address);
+    const uint key = ModHashFromAddr(Address);
 
 	EXCLUSIVE_ACQUIRE(LockPatches);