Remove invalid error message

[ardour.git] / libs / pbd / whitespace.cc

diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc
index 53616133ade362f96c87e2778d1b38b7892fdb93..28be5fc442556de7e37cf2ea33e9bca5f58adf31 100644 (file)
--- a/libs/pbd/whitespace.cc
+++ b/libs/pbd/whitespace.cc
@@ -1,14 +1,35 @@
-#include <pbd/whitespace.h>
+/*
+ * Copyright (C) 2000-2015 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2006 Taybin Rutkin <taybin@taybin.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "pbd/whitespace.h"
 
 using namespace std;
 
+namespace PBD {
+
 void
 strip_whitespace_edges (string& str)
-{   
-    string::size_type i; 
-    string::size_type len;    
-    string::size_type s;
-                                   
+{
+    string::size_type i;
+    string::size_type len;
+    string::size_type s = 0;
+
     len = str.length();
 
     if (len == 1) {
@@ -16,38 +37,39 @@ strip_whitespace_edges (string& str)
     }
 
     /* strip front */
-                                       
+
     for (i = 0; i < len; ++i) {
-        if (isgraph (str[i])) {
+        if (!isspace (str[i])) {
             break;
         }
     }
 
     if (i == len) {
-           /* its all whitespace, not much we can do */
+           /* it's all whitespace, not much we can do */
+               str = "";
            return;
     }
 
     /* strip back */
-    
+
     if (len > 1) {
-    
+
            s = i;
            i = len - 1;
 
            if (s == i) {
                    return;
            }
-           
+
            do {
-                   if (isgraph (str[i]) || i == 0) {
+                   if (!isspace (str[i]) || i == 0) {
                            break;
                    }
 
                    --i;
 
-           } while (true); 
-           
+           } while (true);
+
            str = str.substr (s, (i - s) + 1);
 
     } else {
@@ -55,3 +77,4 @@ strip_whitespace_edges (string& str)
     }
 }
 
+} // namespace PBD