Changeset 73f0a01

Timestamp:

2015-05-31T02:31:24Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2ca933c

Parents:

6e21525

Message:

Move twitter_parse_id() to parse_int64() in misc.c

Files:

• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (2 diffs)

lib/misc.c

@@ -751 +751 @@
         return end - string;
 }
+
+/* Parses a guint64 from string, returns TRUE on success */
+gboolean parse_int64(char *string, int base, guint64 *number)
+{
+        guint64 parsed;
+        char *endptr;
+
+        errno = 0;
+        parsed = g_ascii_strtoull(string, &endptr, base);
+        if (errno || endptr == string || *endptr != '\0') {
+                return FALSE;
+        }
+        *number = parsed;
+        return TRUE;
+}
+

lib/misc.h

@@ -149 +149 @@
 G_MODULE_EXPORT char *get_rfc822_header(const char *text, const char *header, int len);
 G_MODULE_EXPORT int truncate_utf8(char *string, int maxlen);
+G_MODULE_EXPORT gboolean parse_int64(char *string, int base, guint64 *number);
 
 #endif

protocols/twitter/twitter.c

@@ -859 +859 @@
 }
 
-/* Parses a decimal or hex tweet ID, returns TRUE on success */
-static gboolean twitter_parse_id(char *string, int base, guint64 *id)
-{
-        guint64 parsed;
-        char *endptr;
-
-        errno = 0;
-        parsed = g_ascii_strtoull(string, &endptr, base);
-        if (errno || endptr == string || *endptr != '\0') {
-                return FALSE;
-        }
-        *id = parsed;
-        return TRUE;
-}
-
-bee_user_t twitter_log_local_user;
-
 /** Convert the given bitlbee tweet ID, bitlbee username, or twitter tweet ID
  *  into a twitter tweet ID.
@@ -903 +886 @@
                         arg++;
                 }
-                if (twitter_parse_id(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
+                if (parse_int64(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
                         bu = td->log[id].bu;
                         id = td->log[id].id;
-                } else if (twitter_parse_id(arg, 10, &id)) {
+                } else if (parse_int64(arg, 10, &id)) {
                         /* Allow normal tweet IDs as well; not a very useful
                            feature but it's always been there. Just ignore