[gtksourceview/wip/region-tests: 1/3] test-region: fix coding style

[Sébastien Wilmet <swilmet src gnome org>]

commit a31969f08286efdba44e290c40dab3d168f0252f
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Aug 11 10:37:14 2016 +0200

    test-region: fix coding style

 testsuite/test-region.c |   62 ++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/testsuite/test-region.c b/testsuite/test-region.c
index 2e0cee2..4611740 100644
--- a/testsuite/test-region.c
+++ b/testsuite/test-region.c
@@ -27,15 +27,17 @@ static void
 test_region (void)
 {
        GtkTextBuffer *buffer;
-       GtkSourceRegion *region, *intersection;
+       GtkSourceRegion *region;
        GtkSourceRegionIter reg_iter;
-       GtkTextIter iter1, iter2;
+       GtkTextIter iter1;
+       GtkTextIter iter2;
        guint i;
        gchar *region_str = NULL;
 
 #define NUM_OPS 23
 
-       gint ops [NUM_OPS][3] = {
+       gint ops[NUM_OPS][3] =
+       {
                /* add/remove a 0-length region */
                {  1,  5,  5 },
                { -1,  5,  5 },
@@ -82,7 +84,8 @@ test_region (void)
 
 #define NUM_INTERSECTS 5
 
-       gint inter [NUM_INTERSECTS][2] = {
+       gint inter[NUM_INTERSECTS][2] =
+       {
                {  0, 25 },
                { 10, 15 },
                {  8, 17 },
@@ -97,25 +100,30 @@ test_region (void)
        gtk_text_buffer_insert (buffer, &iter1, "This is a test of GtkSourceRegion", -1);
 
        gtk_source_region_get_start_region_iter (region, &reg_iter);
-       if (!gtk_source_region_iter_is_end (&reg_iter)) {
+       if (!gtk_source_region_iter_is_end (&reg_iter))
+       {
                g_print ("problem fetching iterator for an empty region\n");
                g_assert_not_reached ();
        }
 
-       for (i = 0; i < NUM_OPS; i++) {
+       for (i = 0; i < NUM_OPS; i++)
+       {
                const gchar *op_name;
 
-               gtk_text_buffer_get_iter_at_offset (buffer, &iter1, ops [i][1]);
-               gtk_text_buffer_get_iter_at_offset (buffer, &iter2, ops [i][2]);
+               gtk_text_buffer_get_iter_at_offset (buffer, &iter1, ops[i][1]);
+               gtk_text_buffer_get_iter_at_offset (buffer, &iter2, ops[i][2]);
 
-               if (ops [i][0] > 0) {
+               if (ops[i][0] > 0)
+               {
                        op_name = "added";
                        gtk_source_region_add_subregion (region, &iter1, &iter2);
-               } else {
+               }
+               else
+               {
                        op_name = "deleted";
                        gtk_source_region_subtract_subregion (region, &iter1, &iter2);
                }
-               g_print ("%s %d-%d\n", op_name, ops [i][1], ops [i][2]);
+               g_print ("%s %d-%d\n", op_name, ops[i][1], ops[i][2]);
 
                region_str = gtk_source_region_to_string (region);
                g_print ("%s\n", region_str);
@@ -123,20 +131,26 @@ test_region (void)
                region_str = NULL;
        }
 
-       for (i = 0; i < NUM_INTERSECTS; i++) {
-               gtk_text_buffer_get_iter_at_offset (buffer, &iter1, inter [i][0]);
-               gtk_text_buffer_get_iter_at_offset (buffer, &iter2, inter [i][1]);
+       for (i = 0; i < NUM_INTERSECTS; i++)
+       {
+               GtkSourceRegion *intersection;
+
+               gtk_text_buffer_get_iter_at_offset (buffer, &iter1, inter[i][0]);
+               gtk_text_buffer_get_iter_at_offset (buffer, &iter2, inter[i][1]);
 
-               g_print ("intersect %d-%d\n", inter [i][0], inter [i][1]);
+               g_print ("intersect %d-%d\n", inter[i][0], inter[i][1]);
                intersection = gtk_source_region_intersect_subregion (region, &iter1, &iter2);
-               if (intersection) {
+               if (intersection != NULL)
+               {
                        region_str = gtk_source_region_to_string (region);
                        g_print ("%s\n", region_str);
                        g_free (region_str);
                        region_str = NULL;
 
-                       g_clear_object (&intersection);
-               } else {
+                       g_object_unref (intersection);
+               }
+               else
+               {
                        g_print ("no intersection\n");
                }
        }
@@ -146,10 +160,14 @@ test_region (void)
 
        while (!gtk_source_region_iter_is_end (&reg_iter))
        {
-               GtkTextIter s, e;
+               GtkTextIter subregion_start;
+               GtkTextIter subregion_end;
+               gboolean ok;
 
-               gtk_source_region_iter_get_subregion (&reg_iter,
-                                                     &s, &e);
+               ok = gtk_source_region_iter_get_subregion (&reg_iter,
+                                                          &subregion_start,
+                                                          &subregion_end);
+               g_assert (ok);
 
                i++;
                gtk_source_region_iter_next (&reg_iter);
@@ -162,7 +180,7 @@ test_region (void)
 }
 
 int
-main (int argc, char** argv)
+main (int argc, char **argv)
 {
        gtk_test_init (&argc, &argv);