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>
This commit is contained in:
Linus Torvalds 2012-08-26 14:41:05 -07:00
parent 9d10574694
commit 9380f78c82
7 changed files with 18 additions and 18 deletions

View file

@ -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);
}

4
info.c
View file

@ -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:

6
main.c
View file

@ -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);

View file

@ -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();

View file

@ -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;
}

View file

@ -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");

View file

@ -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 */