X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcmem.c;fp=src%2Fcmem.c;h=b53689534ae29ca204f1fe0b2b8b04c58b82067f;hp=48bc632b9ae58728a2145fd8fa4961c01257a3f9;hb=b3a2b67b19dd12e2e1e4bf633f83442df14374d2;hpb=a3aaf838e81e6f56edd7e85d60b2e1361ded6cc6

diff --git a/src/cmem.c b/src/cmem.c
index 48bc632..b536895 100644
--- a/src/cmem.c
+++ b/src/cmem.c
@@ -47,15 +47,14 @@ char *strndup_chk(const char *s, size_t len, const char *tag)
     return t;
 }
 
-char *strip_end(char *s)
+void strip_end(char *s)
 {
-    for(int i = strlen(s) - 1; i > 0 && (s[i] == '\n' || s[i] == ' ' || s[i] == '\t'); i--) {
+    for(int i = strlen(s) - 1; i > 0 && (s[i] == '\n' || s[i] == '\r' || s[i] == ' ' || s[i] == '\t'); i--) {
         s[i] = '\0';
     }
-    return s;
 }
 
-char *strip_casl2_comment(char *s)
+void strip_casl2_comment(char *s)
 {
     bool quoting = false;
 
@@ -69,5 +68,6 @@ char *strip_casl2_comment(char *s)
             break;
         }
     }
-    return s;
+}
+
 }