Changeset 10486 for trunk

Timestamp:

04/28/11 17:35:33 (13 years ago)

Author:

tbretz

Message:

Remove redundant trailing \0s from strings.

Location:

trunk/FACT++/src

Files:

• EventImp.cc (modified) (1 diff)
• EventImp.h (modified) (2 diffs)

trunk/FACT++/src/EventImp.cc

@@ -186 +186 @@
 
     return find(fAllowedStates.begin(), fAllowedStates.end(), state)!=fAllowedStates.end();
+}
+
+// --------------------------------------------------------------------------
+//
+//! @returns the event data converted to a std::string. Trailing redundant
+//!          \0's are removed.
+//!
+string EventImp::GetString() const
+{
+    size_t s = GetSize()-1;
+    while (s>0 && GetText()[s]==0)
+        s--;
+
+    return std::string(GetText(), s+1);
 }
 

trunk/FACT++/src/EventImp.h

@@ -35 +35 @@
     EventImp &operator()(const std::string str) { SetDescription(str); return *this; }
     EventImp &operator()(const char *str) { SetDescription(str); return *this; }
+    EventImp &operator()(int state) { fAllowedStates.push_back(state); return *this; }
 
     // Print contents
@@ -65 +66 @@
     double            GetDouble() const { return *reinterpret_cast<const double*>(GetData()); }
     const char       *GetText() const   { return  reinterpret_cast<const char*>(GetData()); }
-    std::string       GetString() const { return std::string(GetText(), GetSize()); }
     std::vector<char> GetVector() const { return std::vector<char>(GetText(), GetText()+GetSize()); }
-
+    std::string       GetString() const;
 };