run GNU indent everything. not done this for a while because it was producing weird results. seems ok now.

1 files changed, 132 insertions, 127 deletions

diff --git a/src/util.c b/src/util.c
index e520dd6..2beefb1 100644
--- a/src/util.c
+++ b/src/util.c
@@ -33,25 +33,25 @@
 
 #include "util.h"
 
-gboolean is_magnet(gchar *string)
+gboolean is_magnet(gchar * string)
 {
     return g_str_has_prefix(string, "magnet:");
 }
 
-gboolean is_url(gchar *string)
+gboolean is_url(gchar * string)
 {
     //return g_regex_match_simple ("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?", string, 0, 0);
-    return g_regex_match_simple ("^http[s]?://", string, 0, 0);
+    return g_regex_match_simple("^http[s]?://", string, 0, 0);
 }
 
 void add_file_id_to_array(JsonObject * args, gchar * key, gint index)
 {
     JsonArray *array;
     if (json_object_has_member(args, key)) {
-        array = json_object_get_array_member(args, key);
+	array = json_object_get_array_member(args, key);
     } else {
-        array = json_array_new();
-        json_object_set_array_member(args, key, array);
+	array = json_array_new();
+	json_object_set_array_member(args, key, array);
     }
     json_array_add_int_element(array, index);
 }
@@ -64,14 +64,18 @@ void g_str_slist_free(GSList * list)
 
 GRegex *trg_uri_host_regex_new(void)
 {
-    return g_regex_new("^[^:/?#]+:?//(?:www\\.|torrent\\.|torrents\\.|tracker\\.|\\d+\\.)?([^/?#:]*)",
-            G_REGEX_OPTIMIZE, 0, NULL);
+    return
+	g_regex_new
+	("^[^:/?#]+:?//(?:www\\.|torrent\\.|torrents\\.|tracker\\.|\\d+\\.)?([^/?#:]*)",
+	 G_REGEX_OPTIMIZE, 0, NULL);
 }
 
-GtkWidget *my_scrolledwin_new(GtkWidget * child) {
+GtkWidget *my_scrolledwin_new(GtkWidget * child)
+{
     GtkWidget *scrolled_win = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
-            GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+				   GTK_POLICY_AUTOMATIC,
+				   GTK_POLICY_AUTOMATIC);
     gtk_container_add(GTK_CONTAINER(scrolled_win), child);
     return scrolled_win;
 }
@@ -82,20 +86,20 @@ gchar *trg_gregex_get_first(GRegex * rx, const gchar * src)
     gchar *dst = NULL;
     g_regex_match(rx, src, 0, &mi);
     if (mi) {
-        dst = g_match_info_fetch(mi, 1);
-        g_match_info_free(mi);
+	dst = g_match_info_fetch(mi, 1);
+	g_match_info_free(mi);
     }
     return dst;
 }
 
-void trg_error_dialog(GtkWindow * parent, trg_response *response)
+void trg_error_dialog(GtkWindow * parent, trg_response * response)
 {
     gchar *msg = make_error_message(response->obj, response->status);
     GtkWidget *dialog = gtk_message_dialog_new(parent,
-                                               GTK_DIALOG_MODAL,
-                                               GTK_MESSAGE_ERROR,
-                                               GTK_BUTTONS_OK, "%s",
-                                               msg);
+					       GTK_DIALOG_MODAL,
+					       GTK_MESSAGE_ERROR,
+					       GTK_BUTTONS_OK, "%s",
+					       msg);
     gtk_window_set_title(GTK_WINDOW(dialog), _("Error"));
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
@@ -105,19 +109,19 @@ void trg_error_dialog(GtkWindow * parent, trg_response *response)
 gchar *make_error_message(JsonObject * response, int status)
 {
     if (status == FAIL_JSON_DECODE) {
-        return g_strdup(_("JSON decoding error."));
+	return g_strdup(_("JSON decoding error."));
     } else if (status == FAIL_RESPONSE_UNSUCCESSFUL) {
-        const gchar *resultStr =
-            json_object_get_string_member(response, "result");
-        if (resultStr == NULL)
-            return g_strdup(_("Server responded, but with no result."));
-        else
-            return g_strdup(resultStr);
+	const gchar *resultStr =
+	    json_object_get_string_member(response, "result");
+	if (resultStr == NULL)
+	    return g_strdup(_("Server responded, but with no result."));
+	else
+	    return g_strdup(resultStr);
     } else if (status <= -100) {
-        return g_strdup_printf(_("Request failed with HTTP code %d"),
-                               -(status + 100));
+	return g_strdup_printf(_("Request failed with HTTP code %d"),
+			       -(status + 100));
     } else {
-        return g_strdup(curl_easy_strerror(status));
+	return g_strdup(curl_easy_strerror(status));
     }
 }
 
@@ -130,11 +134,11 @@ char *tr_strpercent(char *buf, double x, size_t buflen)
 {
     int precision;
     if (x < 10.0)
-        precision = 2;
+	precision = 2;
     else if (x < 100.0)
-        precision = 1;
+	precision = 1;
     else
-        precision = 0;
+	precision = 0;
 
     tr_snprintf(buf, buflen, "%.*f%%", precision, tr_truncd(x, precision));
     return buf;
@@ -148,18 +152,18 @@ double tr_truncd(double x, int decimal_places)
 }
 
 char *tr_strratio(char *buf, size_t buflen, double ratio,
-                  const char *infinity)
+		  const char *infinity)
 {
     if ((int) ratio == TR_RATIO_NA)
-        tr_strlcpy(buf, _("None"), buflen);
+	tr_strlcpy(buf, _("None"), buflen);
     else if ((int) ratio == TR_RATIO_INF)
-        tr_strlcpy(buf, infinity, buflen);
+	tr_strlcpy(buf, infinity, buflen);
     else if (ratio < 10.0)
-        tr_snprintf(buf, buflen, "%.2f", tr_truncd(ratio, 2));
+	tr_snprintf(buf, buflen, "%.2f", tr_truncd(ratio, 2));
     else if (ratio < 100.0)
-        tr_snprintf(buf, buflen, "%.1f", tr_truncd(ratio, 1));
+	tr_snprintf(buf, buflen, "%.1f", tr_truncd(ratio, 1));
     else
-        tr_snprintf(buf, buflen, "%'.0f", ratio);
+	tr_snprintf(buf, buflen, "%'.0f", ratio);
     return buf;
 }
 
@@ -171,30 +175,30 @@ char *tr_strlratio(char *buf, double ratio, size_t buflen)
 char *tr_strlsize(char *buf, guint64 size, size_t buflen)
 {
     if (!size)
-        g_strlcpy(buf, _("None"), buflen);
+	g_strlcpy(buf, _("None"), buflen);
 #if GLIB_CHECK_VERSION( 2, 16, 0 )
     else {
-        char *tmp = g_format_size_for_display(size);
-        g_strlcpy(buf, tmp, buflen);
-        g_free(tmp);
+	char *tmp = g_format_size_for_display(size);
+	g_strlcpy(buf, tmp, buflen);
+	g_free(tmp);
     }
 #else
     else if (size < (guint64) KILOBYTE_FACTOR)
-        g_snprintf(buf, buflen,
-                   ngettext("%'u byte", "%'u bytes", (guint) size),
-                   (guint) size);
+	g_snprintf(buf, buflen,
+		   ngettext("%'u byte", "%'u bytes", (guint) size),
+		   (guint) size);
     else {
-        gdouble displayed_size;
-        if (size < (guint64) MEGABYTE_FACTOR) {
-            displayed_size = (gdouble) size / KILOBYTE_FACTOR;
-            g_snprintf(buf, buflen, _("%'.1f KB"), displayed_size);
-        } else if (size < (guint64) GIGABYTE_FACTOR) {
-            displayed_size = (gdouble) size / MEGABYTE_FACTOR;
-            g_snprintf(buf, buflen, _("%'.1f MB"), displayed_size);
-        } else {
-            displayed_size = (gdouble) size / GIGABYTE_FACTOR;
-            g_snprintf(buf, buflen, _("%'.1f GB"), displayed_size);
-        }
+	gdouble displayed_size;
+	if (size < (guint64) MEGABYTE_FACTOR) {
+	    displayed_size = (gdouble) size / KILOBYTE_FACTOR;
+	    g_snprintf(buf, buflen, _("%'.1f KB"), displayed_size);
+	} else if (size < (guint64) GIGABYTE_FACTOR) {
+	    displayed_size = (gdouble) size / MEGABYTE_FACTOR;
+	    g_snprintf(buf, buflen, _("%'.1f MB"), displayed_size);
+	} else {
+	    displayed_size = (gdouble) size / GIGABYTE_FACTOR;
+	    g_snprintf(buf, buflen, _("%'.1f GB"), displayed_size);
+	}
     }
 #endif
     return buf;
@@ -204,14 +208,14 @@ char *tr_strlspeed(char *buf, double kb_sec, size_t buflen)
 {
     const double speed = kb_sec;
 
-    if (speed < 1000.0)         /* 0.0 KB to 999.9 KB */
-        g_snprintf(buf, buflen, _("%.1f KB/s"), speed);
-    else if (speed < 102400.0)  /* 0.98 MB to 99.99 MB */
-        g_snprintf(buf, buflen, _("%.2f MB/s"), (speed / KILOBYTE_FACTOR));
-    else if (speed < 1024000.0) /* 100.0 MB to 999.9 MB */
-        g_snprintf(buf, buflen, _("%.1f MB/s"), (speed / MEGABYTE_FACTOR));
-    else                        /* insane speeds */
-        g_snprintf(buf, buflen, _("%.2f GB/s"), (speed / GIGABYTE_FACTOR));
+    if (speed < 1000.0)		/* 0.0 KB to 999.9 KB */
+	g_snprintf(buf, buflen, _("%.1f KB/s"), speed);
+    else if (speed < 102400.0)	/* 0.98 MB to 99.99 MB */
+	g_snprintf(buf, buflen, _("%.2f MB/s"), (speed / KILOBYTE_FACTOR));
+    else if (speed < 1024000.0)	/* 100.0 MB to 999.9 MB */
+	g_snprintf(buf, buflen, _("%.1f MB/s"), (speed / MEGABYTE_FACTOR));
+    else			/* insane speeds */
+	g_snprintf(buf, buflen, _("%.2f GB/s"), (speed / GIGABYTE_FACTOR));
 
     return buf;
 }
@@ -221,7 +225,7 @@ char *tr_strltime_short(char *buf, long seconds, size_t buflen)
     int hours, minutes;
 
     if (seconds < 0)
-        seconds = 0;
+	seconds = 0;
 
     hours = seconds / 3600;
     minutes = (seconds % 3600) / 60;
@@ -238,7 +242,7 @@ char *tr_strltime_long(char *buf, long seconds, size_t buflen)
     char d[128], h[128], m[128], s[128];
 
     if (seconds < 0)
-        seconds = 0;
+	seconds = 0;
 
     days = seconds / 86400;
     hours = (seconds % 86400) / 3600;
@@ -247,32 +251,32 @@ char *tr_strltime_long(char *buf, long seconds, size_t buflen)
 
     g_snprintf(d, sizeof(d), ngettext("%d day", "%d days", days), days);
     g_snprintf(h, sizeof(h), ngettext("%d hour", "%d hours", hours),
-               hours);
+	       hours);
     g_snprintf(m, sizeof(m), ngettext("%d minute", "%d minutes", minutes),
-               minutes);
+	       minutes);
     g_snprintf(s, sizeof(s),
-               ngettext("%ld second", "%ld seconds", seconds), seconds);
+	       ngettext("%ld second", "%ld seconds", seconds), seconds);
 
     if (days) {
-        if (days >= 4 || !hours) {
-            g_strlcpy(buf, d, buflen);
-        } else {
-            g_snprintf(buf, buflen, "%s, %s", d, h);
-        }
+	if (days >= 4 || !hours) {
+	    g_strlcpy(buf, d, buflen);
+	} else {
+	    g_snprintf(buf, buflen, "%s, %s", d, h);
+	}
     } else if (hours) {
-        if (hours >= 4 || !minutes) {
-            g_strlcpy(buf, h, buflen);
-        } else {
-            g_snprintf(buf, buflen, "%s, %s", h, m);
-        }
+	if (hours >= 4 || !minutes) {
+	    g_strlcpy(buf, h, buflen);
+	} else {
+	    g_snprintf(buf, buflen, "%s, %s", h, m);
+	}
     } else if (minutes) {
-        if (minutes >= 4 || !seconds) {
-            g_strlcpy(buf, m, buflen);
-        } else {
-            g_snprintf(buf, buflen, "%s, %s", m, s);
-        }
+	if (minutes >= 4 || !seconds) {
+	    g_strlcpy(buf, m, buflen);
+	} else {
+	    g_snprintf(buf, buflen, "%s, %s", m, s);
+	}
     } else {
-        g_strlcpy(buf, s, buflen);
+	g_strlcpy(buf, s, buflen);
     }
 
     return buf;
@@ -285,7 +289,7 @@ char *gtr_localtime(time_t time)
 
     g_strlcpy(buf, asctime(&tm), sizeof(buf));
     if ((eoln = strchr(buf, '\n')))
-        *eoln = '\0';
+	*eoln = '\0';
 
     return g_locale_to_utf8(buf, -1, NULL, NULL, NULL);
 }
@@ -320,20 +324,20 @@ size_t tr_strlcpy(char *dst, const void *src, size_t siz)
 
     /* Copy as many bytes as will fit */
     if (n != 0) {
-        while (--n != 0) {
-            if ((*d++ = *s++) == '\0')
-                break;
-        }
+	while (--n != 0) {
+	    if ((*d++ = *s++) == '\0')
+		break;
+	}
     }
 
     /* Not enough room in dst, add NUL and traverse rest of src */
     if (n == 0) {
-        if (siz != 0)
-            *d = '\0';          /* NUL-terminate dst */
-        while (*s++);
+	if (siz != 0)
+	    *d = '\0';		/* NUL-terminate dst */
+	while (*s++);
     }
 
-    return s - (char *) src - 1;        /* count does not include NUL */
+    return s - (char *) src - 1;	/* count does not include NUL */
 #endif
 }
 
@@ -344,9 +348,9 @@ evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
     int r = _vsnprintf(buf, buflen, format, ap);
     buf[buflen - 1] = '\0';
     if (r >= 0)
-        return r;
+	return r;
     else
-        return _vscprintf(format, ap);
+	return _vscprintf(format, ap);
 #else
     int r = vsnprintf(buf, buflen, format, ap);
     buf[buflen - 1] = '\0';
@@ -354,66 +358,67 @@ evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
 #endif
 }
 
-void rm_trailing_slashes(gchar *str)
+void rm_trailing_slashes(gchar * str)
 {
     if (!str)
-        return;
+	return;
 
     int i, len;
     if ((len = strlen(str)) < 1)
-        return;
-
-    for (i = strlen(str)-1; str[i]; i--)
-    {
-        if (str[i] == '/')
-            str[i] = '\0';
-        else
-            return;
+	return;
+
+    for (i = strlen(str) - 1; str[i]; i--) {
+	if (str[i] == '/')
+	    str[i] = '\0';
+	else
+	    return;
     }
 }
 
 /* gtk_widget_set_sensitive() was introduced in 2.18, we can have a minimum of
  * 2.16 otherwise. */
 
-void trg_widget_set_visible(GtkWidget * w, gboolean visible) {
+void trg_widget_set_visible(GtkWidget * w, gboolean visible)
+{
     if (visible)
-        gtk_widget_show(w);
+	gtk_widget_show(w);
     else
-        gtk_widget_hide(w);
+	gtk_widget_hide(w);
 }
 
-gdouble json_double_to_progress(JsonNode *n)
+gdouble json_double_to_progress(JsonNode * n)
 {
-    return json_node_really_get_double(n)*100.0;
+    return json_node_really_get_double(n) * 100.0;
 }
 
-gdouble json_node_really_get_double(JsonNode *node)
+gdouble json_node_really_get_double(JsonNode * node)
 {
     GValue a = { 0 };
 
     json_node_get_value(node, &a);
     switch (G_VALUE_TYPE(&a)) {
     case G_TYPE_INT64:
-        return (gdouble) g_value_get_int64(&a);
+	return (gdouble) g_value_get_int64(&a);
     case G_TYPE_DOUBLE:
-        return g_value_get_double(&a);
+	return g_value_get_double(&a);
     default:
-        return 0.0;
+	return 0.0;
     }
 }
 
-gchar *trg_base64encode(const gchar *filename)
+gchar *trg_base64encode(const gchar * filename)
 {
     GError *error = NULL;
-    GMappedFile *mf =  g_mapped_file_new(filename, FALSE, &error);
+    GMappedFile *mf = g_mapped_file_new(filename, FALSE, &error);
     gchar *b64out = NULL;
 
-    if (error)
-    {
-        g_error("%s",error->message);
-        g_error_free(error);
+    if (error) {
+	g_error("%s", error->message);
+	g_error_free(error);
     } else {
-        b64out = g_base64_encode((guchar*)g_mapped_file_get_contents(mf), g_mapped_file_get_length(mf));
+	b64out =
+	    g_base64_encode((guchar *) g_mapped_file_get_contents(mf),
+			    g_mapped_file_get_length(mf));
     }
 
     g_mapped_file_unref(mf);
@@ -434,13 +439,13 @@ GtkWidget *gtr_combo_box_new_enum(const char *text_1, ...)
 
     text = text_1;
     if (text != NULL)
-        do {
-            const int val = va_arg(vl, int);
-            gtk_list_store_insert_with_values(store, NULL, INT_MAX, 0, val,
-                                              1, text, -1);
-            text = va_arg(vl, const char *);
-        }
-        while (text != NULL);
+	do {
+	    const int val = va_arg(vl, int);
+	    gtk_list_store_insert_with_values(store, NULL, INT_MAX, 0, val,
+					      1, text, -1);
+	    text = va_arg(vl, const char *);
+	}
+	while (text != NULL);
 
     w = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
     r = gtk_cell_renderer_text_new();