Changeset 33528bd

Timestamp:

2015-05-07T23:12:06Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

81a15da

Parents:

b71f599

git-author:

dequis <dx@…> (07-05-15 19:53:58)

git-committer:

dequis <dx@…> (07-05-15 23:12:06)

Message:

twitter: split length check function into twitter_message_len

Mostly to be able to test twitter_message_len externally against the
twitter-text conformance tests (the current version definitely fails -
it doesn't do utf8 normalization)

File:

• protocols/twitter/twitter.c (modified) (2 diffs)

protocols/twitter/twitter.c

@@ -483 +483 @@
 }
 
-static gboolean twitter_length_check(struct im_connection *ic, gchar * msg)
-{
-        int max = set_getint(&ic->acc->set, "message_length"), len;
-        int target_len = set_getint(&ic->acc->set, "target_url_length");
+int twitter_message_len(gchar *msg, int target_len)
+{
         int url_len_diff = 0;
 
@@ -493 +491 @@
         }
 
-        if (max == 0 || (len = g_utf8_strlen(msg, -1) + url_len_diff) <= max) {
+        return g_utf8_strlen(msg, -1) + url_len_diff;
+}
+
+static gboolean twitter_length_check(struct im_connection *ic, gchar * msg)
+{
+        int max = set_getint(&ic->acc->set, "message_length");
+        int target_len = set_getint(&ic->acc->set, "target_url_length");
+        int len = twitter_message_len(msg, target_len);
+
+        if (max == 0 || len <= max) {
                 return TRUE;
         }