Makes the separator character configurable in mac_to_string helper fu…

…nction. (#668)
bakerstu · Oct 16, 2022 · 5c78956 · 5c78956
1 parent 01cde51
commit 5c78956
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/utils/format_utils.cxx b/src/utils/format_utils.cxx
@@ -242,7 +242,7 @@ string string_to_hex(const string &arg)
     return ret;
 }
 
-string mac_to_string(uint8_t mac[6], bool colon)
+string mac_to_string(uint8_t mac[6], char colon)
 {
     string ret;
     ret.reserve(12+6);
@@ -257,7 +257,7 @@ string mac_to_string(uint8_t mac[6], bool colon)
         ret += tmp;
         if (colon)
         {
-            ret.push_back(':');
+            ret.push_back(colon);
         }
     }
     if (colon)

diff --git a/src/utils/format_utils.hxx b/src/utils/format_utils.hxx
@@ -135,13 +135,14 @@ string string_to_hex(const string& arg);
 ///
 /// @param mac a 6-byte array storing the MAC address. mac[0] will be printed
 /// at the beginning.
-/// @param colons true to print colons, else false to exclude the colon
-/// seperators
+/// @param colons Specifies byte separators. Leave as default (':') to print
+/// colons, an alternate character to use as separator, or set to 0 to exclude
+/// the seperators entirely.
 ///
-/// @return a string containing a colon-separated hexadecimal printout of the
-/// given MAC address.
+/// @return a string containing a hexadecimal printout of the given MAC
+/// address.
 ///
-string mac_to_string(uint8_t mac[6], bool colons = true);
+string mac_to_string(uint8_t mac[6], char colon = ':');
 
 /// Formats an IPv4 address to string.
 ///