Changeset 3fbce97 for lib/misc.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

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

lib/misc.c

@@ -187 +187 @@
                                 } else if (g_strncasecmp(cs + 1, "br", taglen) == 0) {
                                         *(s++) = '\n';
+                                } else if (g_strncasecmp(cs + 1, "br/", taglen) == 0) {
+                                        *(s++) = '\n';
+                                } else if (g_strncasecmp(cs + 1, "br /", taglen) == 0) {
+                                        *(s++) = '\n';
                                 }
                                 in++;
@@ -295 +299 @@
 
 /* Warning: This one explodes the string. Worst-cases can make the string 3x its original size! */
-/* This fuction is safe, but make sure you call it safely as well! */
+/* This function is safe, but make sure you call it safely as well! */
 void http_encode(char *s)
 {
@@ -767 +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;
+}