Changeset 10425 for trunk/FACT++/src/Converter.cc

Timestamp:

Apr 20, 2011, 3:24:14 PM (9 years ago)

Author:

tbretz

Message:

Changed the GetHex function; added support for hex and octal numbers.

File:

• trunk/FACT++/src/Converter.cc (modified) (2 diffs)

trunk/FACT++/src/Converter.cc

@@ -211 +211 @@
 T Converter::Get(std::stringstream &line) const
 {
+    char c;
+    line >> c;
+
+    if (c=='0')
+    {
+        if (line.peek()==-1)
+            return 0;
+
+        if (line.peek()=='x')
+            line >> hex;
+        else
+            line >> oct;
+
+        line.unget();
+    }
+
+    line.unget();
+
     T val;
     line >> val;
@@ -331 +349 @@
     return stream.str();
 }
-
-// --------------------------------------------------------------------------
-//
-//! Converts from a binary block into a hex representation.
-//!
-//! @param dat
-//!     Pointer to the data block
-//!
-//! @param size
-//!     Size of the data block
-//!
-//! @param chunk
-//!     Size of the size of hex chunks seperted by a ':' in bytes
-//!
-//! @returns
-//!     The string
-//!
-string Converter::GetHex(const void *dat, size_t size, size_t chunk)
-{
-    const unsigned char *ptr = reinterpret_cast<const unsigned char *>(dat);
-
-    ostringstream text;
-
-    text << hex;
-
-    for (size_t i=0; i<size; i++)
-    {
-        text << setw(2) << setfill('0') << (unsigned int)ptr[i];
-        if ((i%chunk)==chunk-1)
-            text << ":";
-    }
-
-    return text.str();
-}
-
 
 // --------------------------------------------------------------------------