Changeset 395 for cpp/frams/util/sstring-simple.cpp

Timestamp:

06/23/15 00:50:52 (9 years ago)

Author:

Maciej Komosinski

Message:

Fixed int/bool warnings

File:

• cpp/frams/util/sstring-simple.cpp (modified) (3 diffs)

cpp/frams/util/sstring-simple.cpp

@@ -167 +167 @@
 ///////////////////////////////////////
 
-int SString::equals(const SString& s) const
-{
-if (this==&s) return 1;
-if (len()!=s.len()) return 0;
-return !strcmp(getPtr(),s.getPtr());
+bool SString::equals(const SString& s) const
+{
+if (this==&s) return true;
+if (len()!=s.len()) return false;
+return strcmp(getPtr(),s.getPtr())==0;
 }
 
@@ -194 +194 @@
 }
 
-int SString::getNextToken (int& pos,SString &token,char separator) const
-{
-if (pos>=len()) {token=0;return 0;}
+bool SString::getNextToken (int& pos,SString &token,char separator) const
+{
+if (pos>=len()) {token=0;return false;}
 int p1=pos,p2;
 const char *t1=getPtr()+pos;
@@ -203 +203 @@
 strncpy(token.directWrite(p2-p1),t1,p2-p1);
 token.endWrite(p2-p1);
-return 1;
-}
-
-int SString::startsWith(const char *pattern) const
+return true;
+}
+
+bool SString::startsWith(const char *pattern) const
 {
 const char *t=this->c_str();
 for (;*pattern;pattern++,t++)
-        if (*t != *pattern) return 0;
-return 1;
+        if (*t != *pattern) return false;
+return true;
 }