Packets: Add StringParser ostream operation

[senf.git] / Utils / Termlib / Terminfo.cc

diff --git a/Utils/Termlib/Terminfo.cc b/Utils/Termlib/Terminfo.cc
index 232a188..44bdb6f 100644 (file)
--- a/Utils/Termlib/Terminfo.cc
+++ b/Utils/Termlib/Terminfo.cc
@@ -240,15 +240,15 @@ prefix_ std::string senf::term::Terminfo::formatString(properties::String p,
     std::string result;
 
     for (std::string::const_iterator i (prgstr.begin()); i != prgstr.end(); ++i) {
-       if (*i != '%') {
-           result += *i;
-           continue;
-       }
-       int width = 0, base = 0;
-       switch (*++i) {
+    if (*i != '%') {
+        result += *i;
+        continue;
+    }
+    int width = 0, base = 0;
+    switch (*++i) {
         case '%': result += *i; break;
         case 'i': ++arg1; ++arg2; break;
-        case 'c': result += char(stack.pop()); break;
+        case 'c': result += char(stack.pop());  break;
         case 'x': base = 16; continue;
         case '0': if (!base) base = 8;
         case '1': case '2': case '3': case '4':
@@ -264,7 +264,7 @@ prefix_ std::string senf::term::Terminfo::formatString(properties::String p,
             continue;
         }
         case '}': stack.push(width); break;
-           // Binary operands are in infix (reversed) order
+        // Binary operands are in infix (reversed) order
         case '+': stack.push(stack.pop() + stack.pop()); break;
         case '-': stack.push(-stack.pop() + stack.pop()); break;
         case '*': stack.push(stack.pop() * stack.pop()); break;
@@ -450,7 +450,7 @@ prefix_ void senf::term::Terminfo::load(std::istream & is)
     strings_.resize(offsets.size());
     StringVec::iterator j (strings_.begin());
     for (OffsetVec::iterator i (offsets.begin()); i != offsets.end(); ++i, ++j)
-        if (*i != NoValue && *i >= 0 && *i < stringPool_.size())
+        if (*i != NoValue && *i >= 0 && unsigned(*i) < stringPool_.size())
             *j = &(stringPool_[0]) + *i;
         else
             *j = 0;