Standardize the string functions and search for them properly when configuring on different OSs.

2 files changed, 6 insertions, 6 deletions

diff --git a/common/stringx.c b/common/compat.c
index 3705cb9..9d2f53f 100644
--- a/common/stringx.c
+++ b/common/compat.c
@@ -98,8 +98,8 @@ stretrim(char* data)
 char*
 strtrim(char* data)
 {
-    data = (char*)trim_start(data);
-    trim_end(data);
+    data = (char*)strbtrim(data);
+    stretrim(data);
     return data;
 }
 
diff --git a/common/stringx.h b/common/compat.h
index 3949d70..17967f4 100644
--- a/common/stringx.h
+++ b/common/compat.h
@@ -50,19 +50,19 @@ size_t strlcat(char* dst, const char* src, size_t siz);
 #endif
 
 #ifndef HAVE_STRCLN
-void strcln(char* data);
+void strcln(char* data, char ch);
 #endif
 
 #ifndef HAVE_STRBTRIM
-char* trim_start(const char* data);
+char* strbtrim(const char* data);
 #endif
 
 #ifndef HAVE_STRETRIM
-void trim_end(char* data);
+void stretrim(char* data);
 #endif
 
 #ifndef HAVE_STRTRIM
-char* trim_space(char* data);
+char* strtrim(char* data);
 #endif
 
 #ifndef HAVE_STRTOB