Changes in lib/misc.c [fca4683:47ab9a9]

File:

• lib/misc.c (modified) (3 diffs)

lib/misc.c

@@ -549 +549 @@
 }
 
+/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap(const char *msg, int line_len)
 {
@@ -581 +582 @@
                 }
                 if (i == 0) {
-                        const char *end;
-                        size_t len;
-
-                        g_utf8_validate(msg, line_len, &end);
-
-                        len = (end != msg) ? end - msg : line_len;
-
-                        g_string_append_len(ret, msg, len);
+                        g_string_append_len(ret, msg, line_len);
                         g_string_append_c(ret, '\n');
-                        msg += len;
+                        msg += line_len;
                 }
         }
@@ -793 +787 @@
         return string;
 }
-
-/* Returns a string that is exactly 'char_len' utf8 characters long (not bytes),
- * padded to the right with spaces or truncated with the 'ellipsis' parameter
- * if specified (can be NULL).
- * Returns a newly allocated string, or NULL on invalid parameters. */
-char *str_pad_and_truncate(const char *string, long char_len, const char *ellipsis)
-{
-        size_t string_len = strlen(string);
-        size_t ellipsis_len = (ellipsis) ? strlen(ellipsis) : 0;
-        long orig_len = g_utf8_strlen(string, -1);
-
-        g_return_val_if_fail(char_len > ellipsis_len, NULL);
-
-        if (orig_len > char_len) {
-                char *ret = g_malloc(string_len + 1);
-                g_utf8_strncpy(ret, string, char_len - ellipsis_len);
-                if (ellipsis) {
-                        g_strlcat(ret, ellipsis, string_len);
-                }
-                return ret;
-        } else if (orig_len < char_len) {
-                return g_strdup_printf("%s%*s", string, (int) (char_len - orig_len), "");
-        } else {
-                return g_strdup(string);
-        }
-}