Move trim_endline to str unit

diff --git a/src/game/level/labels.c b/src/game/level/labels.c
index 71f976c24966f5fcc87fd8255c036f30a1065950..ea6e38c491fef854b6e228e43a8fb2772ea8ae3c 100644 (file)
--- a/src/game/level/labels.c
+++ b/src/game/level/labels.c
@@ -4,6 +4,7 @@
 #include "game/level/labels.h"
 #include "system/error.h"
 #include "system/lt.h"
+#include "str.h"
 
 #define LABEL_TEXT_MAX_LENGTH 64
 
@@ -18,21 +19,6 @@ struct Labels
     int *visible;
 };
 
-static char *trim_endline(char *s)
-{
-    const size_t n = strlen(s);
-
-    if (n == 0) {
-        return s;
-    }
-
-    if (s[n - 1] == '\n') {
-        s[n - 1] = '\0';
-    }
-
-    return s;
-}
-
 Labels *create_labels_from_stream(FILE *stream)
 {
     assert(stream);

diff --git a/src/str.c b/src/str.c
index 3ece0d9d6319ad007083999e9147249dd8df939b..28030825d2612d2aa6fb65a3689a238b1694962f 100644 (file)
--- a/src/str.c
+++ b/src/str.c
@@ -21,3 +21,18 @@ char *string_duplicate(const char *str,
 
     return dup_str;
 }
+
+char *trim_endline(char *s)
+{
+    const size_t n = strlen(s);
+
+    if (n == 0) {
+        return s;
+    }
+
+    if (s[n - 1] == '\n') {
+        s[n - 1] = '\0';
+    }
+
+    return s;
+}

diff --git a/src/str.h b/src/str.h
index f4bfd9e012dc5598a5d012a103d527e46eb560af..f6331031f96f6d79961c15549f635e5e73ad55ab 100644 (file)
--- a/src/str.h
+++ b/src/str.h
@@ -6,5 +6,6 @@
 
 char *string_duplicate(const char *str,
                        const char *str_end);
+char *trim_endline(char *s);
 
 #endif  // STR_H_