Changeset b75671d for lib

Timestamp:

2015-06-17T22:47:26Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (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 remote-tracking branch 'origin/master' into parson

Location:

lib

Files:

• events_glib.c (modified) (4 diffs)
• misc.c (modified) (1 diff)
• misc.h (modified) (1 diff)
• oauth2.c (modified) (1 diff)

lib/events_glib.c

@@ -82 +82 @@
         }
 
-        event_debug("gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data);
+        event_debug("gaim_io_invoke( %d, %d, %p )\n", g_io_channel_unix_get_fd(source), condition, data);
 
         st = closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);
@@ -101 +101 @@
 static void gaim_io_destroy(gpointer data)
 {
-        event_debug("gaim_io_destroy( 0x%x )\n", data);
+        event_debug("gaim_io_destroy( 0%p )\n", data);
         g_free(data);
 }
@@ -127 +127 @@
                                  gaim_io_invoke, closure, gaim_io_destroy);
 
-        event_debug("b_input_add( %d, %d, 0x%x, 0x%x ) = %d (%p)\n", source, condition, function, data, st, closure);
+        event_debug("b_input_add( %d, %d, %p, %p ) = %d (%p)\n", source, condition, function, data, st, closure);
 
         g_io_channel_unref(channel);
@@ -140 +140 @@
         gint st = g_timeout_add(timeout, (GSourceFunc) func, data);
 
-        event_debug("b_timeout_add( %d, %d, %d ) = %d\n", timeout, func, data, st);
+        event_debug("b_timeout_add( %d, %p, %p ) = %d\n", timeout, func, data, st);
 
         return st;

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

lib/oauth2.c

@@ -138 +138 @@
         struct oauth2_access_token_data *cb_data = req->data;
         char *atoken = NULL, *rtoken = NULL, *error = NULL;
-        char *content_type;
+        char *content_type = NULL;
 
-        if (getenv("BITLBEE_DEBUG") && req->reply_body) {
+        if (req->status_code <= 0 && !req->reply_body) {
+                cb_data->func(cb_data->data, NULL, NULL, req->status_string);
+                g_free(cb_data);
+                return;
+        }
+
+        if (getenv("BITLBEE_DEBUG")) {
                 printf("%s\n", req->reply_body);
         }