MXS-2208 Move trim-functions from maxscale to maxbase

log.h now includes string.hh, which is conceptually wrong, but
log.h will shortly disappear and be superceded by log.hh.

maxutils/maxbase/include/maxbase/string.h

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2018 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
- *
- * Change Date: 2022-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-#pragma once
-
-#include <maxbase/cdefs.h>
-
-MXB_BEGIN_DECLS
-
-/**
- * Thread-safe strerror
- */
-const char* mxb_strerror(int error);
-
-MXB_END_DECLS

maxutils/maxbase/include/maxbase/string.hh

@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2018 MariaDB Corporation Ab
+ *
+ * Use of this software is governed by the Business Source License included
+ * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
+ *
+ * Change Date: 2022-01-01
+ *
+ * On the date above, in accordance with the Business Source License, use
+ * of this software will be governed by version 2 or later of the General
+ * Public License.
+ */
+#pragma once
+
+#include <maxbase/ccdefs.hh>
+#include <algorithm>
+#include <string>
+
+/**
+ * Thread-safe (but not re-entrant) strerror.
+ *
+ * @param error  An errno value.
+ *
+ * @return  The corresponding string.
+ */
+const char* mxb_strerror(int error);
+
+namespace maxbase
+{
+
+/**
+ * Left trim a string.
+ *
+ * @param str String to trim.
+ * @return @c str
+ *
+ * @note If there is leading whitespace, the string is moved so that
+ *       the returned pointer is always the same as the one given as
+ *       argument.
+ */
+char* ltrim(char* str);
+
+/**
+ * Right trim a string.
+ *
+ * @param str String to trim.
+ * @return @c str
+ *
+ * @note The returned pointer is always the same the one given as
+ *       argument.
+ */
+char* rtrim(char* str);
+
+/**
+ * Left and right trim a string.
+ *
+ * @param str String to trim.
+ * @return @c str
+ *
+ * @note If there is leading whitespace, the string is moved so that
+ *       the returned pointer is always the same the one given as
+ *       argument.
+ */
+char* trim(char* str);
+
+/**
+ * @brief Left trim a string.
+ *
+ * @param s  The string to be trimmed.
+ */
+inline void ltrim(std::string& s)
+{
+    s.erase(s.begin(),
+            std::find_if(s.begin(),
+                         s.end(),
+                         std::not1(std::ptr_fun<int, int>(std::isspace))));
+}
+
+/**
+ * @brief Right trim a string.
+ *
+ * @param s  The string to be trimmed.
+ */
+inline void rtrim(std::string& s)
+{
+    s.erase(std::find_if(s.rbegin(),
+                         s.rend(),
+                         std::not1(std::ptr_fun<int, int>(std::isspace))).base(),
+            s.end());
+}
+
+/**
+ * @brief Trim a string.
+ *
+ * @param s  The string to be trimmed.
+ */
+inline void trim(std::string& s)
+{
+    ltrim(s);
+    rtrim(s);
+}
+
+/**
+ * @brief Left-trimmed copy of a string.
+ *
+ * @param s  The string to the trimmed.
+ *
+ * @return A left-trimmed copy of the string.
+ */
+inline std::string ltrimmed_copy(const std::string& original)
+{
+    std::string s(original);
+    ltrim(s);
+    return s;
+}
+
+/**
+ * @brief Right-trimmed copy of a string.
+ *
+ * @param s  The string to the trimmed.
+ *
+ * @return A right-trimmed copy of the string.
+ */
+inline std::string rtrimmed_copy(const std::string& original)
+{
+    std::string s(original);
+    rtrim(s);
+    return s;
+}
+
+/**
+ * @brief Trimmed copy of a string.
+ *
+ * @param s  The string to the trimmed.
+ *
+ * @return A trimmed copy of the string.
+ */
+inline std::string trimmed_copy(const std::string& original)
+{
+    std::string s(original);
+    ltrim(s);
+    rtrim(s);
+    return s;
+}
+
+}