Changeset 395 for cpp/frams

Timestamp:

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

Author:

Maciej Komosinski

Message:

Fixed int/bool warnings

Location:

cpp/frams/util

Files:

• sstring-simple.cpp (modified) (3 diffs)
• sstring-simple.h (modified) (2 diffs)
• sstring.cpp (modified) (2 diffs)
• sstring.h (modified) (1 diff)

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;
 }
 

cpp/frams/util/sstring-simple.h

@@ -110 +110 @@
 void operator+=(const SString&); ///< append other SString
 
-int equals(const SString &s) const; ///< TRUE if equal
-int operator==(const SString &s) const {return equals(s);} ///< TRUE if equal
-int operator!=(const SString &s) const {return !equals(s);} ///< TRUE if not equal
+bool equals(const SString &s) const; ///< TRUE if equal
+bool operator==(const SString &s) const {return equals(s);} ///< TRUE if equal
+bool operator!=(const SString &s) const {return !equals(s);} ///< TRUE if not equal
 bool operator<(const SString &s) const {return strcmp(getPtr(),s.getPtr())<1;}
 const char* operator()(int p) const {return getPtr()+p;} ///< pointer to p'th character in SString
@@ -125 +125 @@
 /// <B>pos</B> is moved accordingly.
 /// returns <B>false</B> if no more tokens are available or <B>true</B> otherwise.
-int getNextToken(int& pos,SString &token,char separator) const;
+bool getNextToken(int& pos,SString &token,char separator) const;
 
 void operator+=(char ch) {directAppend(1)[0]=ch;endAppend(1);} ///< append single character
 
-int startsWith(const char *pattern) const;
+bool startsWith(const char *pattern) const;
 char charAt(int pos) const {return operator[](pos);}
 uint32_t hash() const;

cpp/frams/util/sstring.cpp

@@ -333 +333 @@
 }
 
-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=buf->txt+pos;
@@ -342 +342 @@
 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;
 }
 

cpp/frams/util/sstring.h

@@ -171 +171 @@
 /// <B>pos</B> is moved accordingly.
 /// returns <B>false</B> if no more tokens are available or <B>true</B> otherwise.
-int getNextToken(int& pos,SString &token,char separator) const;
+bool getNextToken(int& pos,SString &token,char separator) const;
 
 void operator+=(char ch) {directAppend(1)[0]=ch;endAppend(1);} ///< append single character
 
-int startsWith(const char *pattern) const;
+bool startsWith(const char *pattern) const;
 char charAt(int pos) const {return buf->txt[pos];}
 uint32_t hash() const {return buf->hash();}