Avoid type casts and work on full unsigneds instead

Author: tautschnig

src/util/unicode.cpp

@@ -167,12 +167,12 @@ std::vector<std::string> narrow_argv(int argc, const wchar_t **argv_wide)
 }
 
 /// A helper function for dealing with different UTF16 endians
-/// \par parameters: A 16-bit integer
-/// \return A 16-bit integer with bytes swapped
-uint16_t do_swap_bytes(uint16_t x)
+/// \par x Integer the lower two bytes of which are to be swapped
+/// \return The lower 16 bits of the integer with those bytes swapped
+unsigned do_swap_bytes(unsigned x)
 {
-  uint16_t b1=x & 0xFF;
-  uint16_t b2=x & 0xFF00;
+  const unsigned b1 = x & 0xFFu;
+  const unsigned b2 = x & 0xFF00u;
   return (b1 << 8) | (b2 >> 8);
 }
 
@@ -197,10 +197,10 @@ void utf16_append_code(unsigned int code, bool swap_bytes, std::wstring &result)
     // encode the code in UTF16, possibly swapping bytes.
     code=code-0x10000;
     unsigned int i1=((code>>10) & 0x3ff) | 0xD800;
-    unsigned int a1=(swap_bytes)?do_swap_bytes(static_cast<uint16_t>(i1)):i1;
+    const unsigned int a1 = swap_bytes ? do_swap_bytes(i1) : i1;
     result+=static_cast<wchar_t>(a1);
     unsigned int i2=(code & 0x3ff) | 0xDC00;
-    unsigned int a2=(swap_bytes)?do_swap_bytes(static_cast<uint16_t>(i2)):i2;
+    const unsigned int a2 = swap_bytes ? do_swap_bytes(i2) : i2;
     result+=static_cast<wchar_t>(a2);
   }
 }