Changeset 11196

Timestamp:

04/03/07 19:18:17 (2 years ago)

Author:

mloskot

Message:

Backported CPLString::Trim() function introduced recently in trunk.

Files:

• branches/1.4/gdal/port/cpl_string.h (modified) (2 diffs)
• branches/1.4/gdal/port/cplstring.cpp (modified) (2 diffs)

branches/1.4/gdal/port/cpl_string.h

@@ -170 +170 @@
-{
-public:
+    
-    CPLString(void) {}
-    CPLString( const std::string &oStr ) : std_string( oStr ) {}
@@ -178 +179 @@
-    CPLString &Printf( const char *pszFormat, ... );
-    CPLString &vPrintf( const char *pszFormat, va_list args );
+    CPLString &Trim();
-};
-

branches/1.4/gdal/port/cplstring.cpp

@@ -29 +29 @@
-
-#include "cpl_string.h"
+#include <string>
-
-CPL_CVSID("$Id$");
@@ -130 +131 @@
-    return *this;
-}
+
+/************************************************************************/
+/*                                Trim()                                */
+/************************************************************************/
+
+/**
+ * Trim white space.
+ *
+ * Trims white space off the let and right of the string.  White space
+ * is any of a space, a tab, a newline ('\n') or a carriage control ('\r').
+ *
+ * @return a reference to the CPLString. 
+ */
+
+CPLString &CPLString::Trim()
+
+{
+    size_t iLeft, iRight;
+    static const char szWhitespace[] = " \t\r\n";
+
+    iLeft = find_first_not_of( szWhitespace );
+    iRight = find_last_not_of( szWhitespace );
+
+    if( iLeft == std::string::npos )
+    {
+        erase();
+        return *this;
+    }
+    
+    assign( substr( iLeft, iRight - iLeft + 1 ) );
+
+    return *this;
+}