Changeset 47ab9a9

Timestamp:

2015-11-27T23:42:00Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

31d9930

Parents:

d088ee8

Message:

misc.c: Add a str_reject_chars function, use it in otr_filter_colors

Files:

• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• otr.c (modified) (1 diff)

lib/misc.c

@@ -771 +771 @@
 }
 
+/* Filters all the characters in 'blacklist' replacing them with 'replacement'.
+ * Modifies the string in-place and returns the string itself.
+ * For the opposite, use g_strcanon() */
+char *str_reject_chars(char *string, const char *reject, char replacement)
+{
+        char *c = string;
+
+        while (*c) {
+                c += strcspn(c, reject);
+                if (*c) {
+                        *c = replacement;
+                }
+        }
+
+        return string;
+}

lib/misc.h

@@ -150 +150 @@
 G_MODULE_EXPORT int truncate_utf8(char *string, int maxlen);
 G_MODULE_EXPORT gboolean parse_int64(char *string, int base, guint64 *number);
+G_MODULE_EXPORT char *str_reject_chars(char *string, const char *reject, char replacement);
 
 #endif

otr.c

@@ -751 +751 @@
 }
 
-static char *otr_filter_colors(char *msg) {
-        int i;
-        for (i = 0; msg[i]; i++) {
-                if (msg[i] == '\x02' || msg[i] == '\x03') {
-                        msg[i] = '?';
-                }
-        }
-        return msg;
+static char *otr_filter_colors(char *msg)
+{
+        return str_reject_chars(msg, "\x02\x03", '?');
 }