Changeset 10287 for trunk

Timestamp:

04/05/11 11:25:05 (14 years ago)

Author:

tbretz

Message:

Replaced some int by size_t.

Location:

trunk/FACT++/src

Files:

• Converter.cc (modified) (7 diffs)
• Converter.h (modified) (2 diffs)

trunk/FACT++/src/Converter.cc

@@ -342 +342 @@
 //!     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, int size)
-{
-    const char *ptr = reinterpret_cast<const char *>(dat);
+string Converter::GetHex(const void *dat, size_t size, size_t chunk)
+{
+    const unsigned char *ptr = reinterpret_cast<const unsigned char *>(dat);
 
     ostringstream text;
@@ -353 +356 @@
     text << hex;
 
-    for (int i=0; i<size; i++)
-        text << setw(2) << ptr[i] << " ";
+    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();
 }
+
 
 // --------------------------------------------------------------------------
@@ -493 +501 @@
 
     // If the format is empty we are already done
-    if (empty())
-    {
-        if (str.empty())
-        {
-            wout << endl;
-            return vector<T>();
-        }
-
+    if (empty() && str.empty())
+    {
         wout << endl;
-        wout << kRed << "Data string not empty as it ought to be!" << endl;
         return vector<T>();
     }
@@ -523 +524 @@
         for (int j=0; j<i->second.first; j++)
         {
-            cout << j << ": " << i->first.first->name() << endl;
             switch (i->first.first->name()[0])
             {
@@ -620 +620 @@
 //!
 template<class T>
-T Converter::Get(const void *dat, int size) const
+T Converter::Get(const void *dat, size_t size) const
 {
     if (!valid())
@@ -678 +678 @@
 }
 
-std::vector<boost::any> Converter::GetAny(const void *dat, int size) const
+std::vector<boost::any> Converter::GetAny(const void *dat, size_t size) const
 {
     return Get<vector<boost::any>>(dat, size);
 }
 
-std::vector<char> Converter::GetVector(const void *dat, int size) const
+std::vector<char> Converter::GetVector(const void *dat, size_t size) const
 {
     const string ref = GetString(dat, size);
@@ -694 +694 @@
 }
 
-string Converter::GetString(const void *dat, int size) const
+string Converter::GetString(const void *dat, size_t size) const
 {
     const string s = Get<string>(dat, size);

trunk/FACT++/src/Converter.h

@@ -52 +52 @@
         std::vector<T> Get(const std::string &str) const;
     template <class T>
-        T Get(const void *d, int size) const;
+        T Get(const void *d, size_t size) const;
 
 
@@ -82 +82 @@
     static FormatList Compile(const std::string &fmt, bool strict=false);
 
-    std::string             GetString(const void *d, int size) const;
-    std::vector<char>       GetVector(const void *d, int size) const;
-    std::vector<boost::any> GetAny(const void *d, int size) const;
+    std::string             GetString(const void *d, size_t size) const;
+    std::vector<char>       GetVector(const void *d, size_t size) const;
+    std::vector<boost::any> GetAny(const void *d, size_t size) const;
 
     std::vector<boost::any> GetAny(const std::string &str) const;
     std::vector<char>       GetVector(const std::string &str) const;
 
-    static std::string GetHex(const void *d, int size);
+    static std::string GetHex(const void *d, size_t size, size_t chunk=1);
 
 /*