Do some whitespace cleanup

The previous commit was a patch from Lubomir, which also had some
whitespace fixes (to go with some new whitespace bugs to replace them)
in it.

I removed the whitespace changes from that patch (don't mix whitespace
fixes with other fixes, unless they are on the same lines!) but decided
to look for other whitespace issues, and this is the result.

I left the non-C files alone, some of the spec and script files also
have whitespace at the end of lines etc.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/gtk-gui.c b/gtk-gui.c
index 04b7af113fac2edb5ccfa0372fb898f286cc8083..bebc4f932d3838c872d8aa2045938166f8d0234f 100644 (file)
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -98,7 +98,7 @@ void report_error(GError* error)
        {
                return;
        }
-       
+
        if (error_info_bar == NULL)
        {
                error_count = 1;
@@ -108,11 +108,11 @@ void report_error(GError* error)
                g_signal_connect(error_info_bar, "response", G_CALLBACK(on_info_bar_response), NULL);
                gtk_info_bar_set_message_type(GTK_INFO_BAR(error_info_bar),
                                              GTK_MESSAGE_ERROR);
-               
+
                error_label = gtk_label_new(error->message);
                GtkWidget *container = gtk_info_bar_get_content_area(GTK_INFO_BAR(error_info_bar));
                gtk_container_add(GTK_CONTAINER(container), error_label);
-               
+
                gtk_box_pack_start(GTK_BOX(main_vbox), error_info_bar, FALSE, FALSE, 0);
                gtk_widget_show_all(main_vbox);
        }
@@ -151,7 +151,7 @@ static void file_open(GtkWidget *w, gpointer data)
                GSList *filenames, *fn_glist;
                char *filename;
                filenames = fn_glist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
-               
+
                GError *error = NULL;
                while(filenames != NULL) {
                        filename = filenames->data;
@@ -162,7 +162,7 @@ static void file_open(GtkWidget *w, gpointer data)
                                g_error_free(error);
                                error = NULL;
                        }
-                       
+
                        g_free(filename);
                        filenames = g_slist_next(filenames);
                }

diff --git a/info.c b/info.c
index 17667a87bfad98f728b114297056a20053f6caf4..cccc6497b9515ea71d4087dfbb905bf74d2391f9 100644 (file)
--- a/info.c
+++ b/info.c
@@ -1,7 +1,7 @@
 /* info.c */
-/* creates the UI for the info frame - 
+/* creates the UI for the info frame -
  * controlled through the following interfaces:
- * 
+ *
  * void show_dive_info(struct dive *dive)
  *
  * called from gtk-ui:

diff --git a/main.c b/main.c
index 8e579f88c067b78891967684cc80b1469714ffb0..2489473b9c2f9fe43f65c4ce0405fba3b79e7cc6 100644 (file)
--- a/main.c
+++ b/main.c
@@ -172,7 +172,7 @@ static void parse_argument(const char *arg)
                        if (strncmp(arg, "-psn_", 5) == 0) {
                                return;
                        }
-                       /* fallthrough */ 
+                       /* fallthrough */
                default:
                        fprintf(stderr, "Bad argument '%s'\n", arg);
                        exit(1);
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
        parse_xml_init();
 
        init_ui(&argc, &argv);
-       
+
        for (i = 1; i < argc; i++) {
                const char *a = argv[i];
 
@@ -227,7 +227,7 @@ int main(int argc, char **argv)
                }
                GError *error = NULL;
                parse_file(a, &error);
-               
+
                if (error != NULL)
                {
                        report_error(error);

diff --git a/parse-xml.c b/parse-xml.c
index 173314dd42161ff28af7c7374bdf80e23ee6a706..ab77cb59bff5a77a2badb0a8ea6e41e4b1a6c0db 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -1420,8 +1420,8 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, GError **er
                }
                return;
        }
-       /* we assume that the last (or only) filename passed as argument is a 
-        * great filename to use as default when saving the dives */ 
+       /* we assume that the last (or only) filename passed as argument is a
+        * great filename to use as default when saving the dives */
        set_filename(url);
        reset_all();
        dive_start();

diff --git a/profile.c b/profile.c
index 9618c4680c86f5d146b9bb8a550148a90160bca4..6a159cca85681fcc8436f159e6d0da9deb56e7c4 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -1,5 +1,5 @@
 /* profile.c */
-/* creates all the necessary data for drawing the dive profile 
+/* creates all the necessary data for drawing the dive profile
  * uses cairo to draw it
  */
 #include <stdio.h>
@@ -873,7 +873,7 @@ static velocity_t velocity(int speed)
        else if (speed < -25) /* -5ft/min */
                v = SLOW;
        else if (speed < 25) /* very hard to find data, but it appears that the recommendations
-                               for descent are usually about 2x ascent rate; still, we want 
+                               for descent are usually about 2x ascent rate; still, we want
                                stable to mean stable */
                v = STABLE;
        else if (speed < 152) /* between 5 and 30ft/min is considered slow */
@@ -929,7 +929,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
                                int past = -2;
                                while (i+past > 0 && entry[0].sec - entry[past].sec < 15)
                                        past--;
-                               entry->velocity = velocity((entry[0].depth - entry[past].depth) / 
+                               entry->velocity = velocity((entry[0].depth - entry[past].depth) /
                                                        (entry[0].sec - entry[past].sec));
                        }
                } else
@@ -941,7 +941,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
                struct plot_data *entry = pi->entry +i;
                analyze_plot_info_minmax(entry, pi->entry, pi->entry+nr);
        }
-       
+
        return pi;
 }
 

diff --git a/statistics.c b/statistics.c
index b9d2c3b95d19c57f96b2a353e274d9bb4304c301..a53617337fa712b8864a3fdc4aee20bd8b7f9682 100644 (file)
--- a/statistics.c
+++ b/statistics.c
@@ -211,7 +211,7 @@ static void show_single_dive_stats(struct dive *dive)
        set_label(single_w.date, buf);
        set_label(single_w.dive_time, "%d min", (dive->duration.seconds + 30) / 60);
        if (prev_dive)
-               set_label(single_w.surf_intv, 
+               set_label(single_w.surf_intv,
                        get_time_string(dive->when - (prev_dive->when + prev_dive->duration.seconds), 4));
        else
                set_label(single_w.surf_intv, "unknown");

diff --git a/uemis.h b/uemis.h
index 29a168f5d3449a04efd066b6803e50e78a3be086..ba9a234024dbaa50541c2a1024730364b1500ad5 100644 (file)
--- a/uemis.h
+++ b/uemis.h
@@ -28,7 +28,7 @@ typedef struct {
        uint16_t        consumption;            // (units unclear)
        uint8_t         rgt;                    // (remaining gas time in minutes)
        uint8_t         cns;
-       uint8_t         flags[8]; 
+       uint8_t         flags[8];
 } __attribute((packed)) uemis_sample_t;
 
 #endif /* DIVE_H */