Minor code cleanup:

- Define several event callback functions with the correct number of args;
- Remove several unnecessary 'if (!user_data)  exit(10);' code sequences;
- Use 'user_data' arg of event callbacks instead of an object property
  in several cases;
- Reformat some long lines.


svn path=/trunk/; revision=33677

1 files changed, 68 insertions, 115 deletions

diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index a5b9272b77..7e52234547 100644
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -83,16 +83,16 @@ static GtkWidget *save_to_file_w = NULL;
 #define TIME_WIDTH 50
 
 #define NODE_CHARS_WIDTH 20
-#define CONV_TIME_HEADER "Conv.| Time    "
+#define CONV_TIME_HEADER       "Conv.| Time    "
 #define TIME_HEADER "|Time     "
-#define CONV_TIME_EMPTY_HEADER     "     |         "
-#define TIME_EMPTY_HEADER     "|         "
+#define CONV_TIME_EMPTY_HEADER "     |         "
+#define TIME_EMPTY_HEADER      "|         "
 #define CONV_TIME_HEADER_LENGTH 16
 #define TIME_HEADER_LENGTH 10
 
 /****************************************************************************/
 /* Reset the user_data structure */
-static void graph_analysis_reset(graph_analysis_data_t* user_data)
+static void graph_analysis_reset(graph_analysis_data_t *user_data)
 {
 	int i;
 
@@ -113,7 +113,7 @@ static void graph_analysis_reset(graph_analysis_data_t* user_data)
 
 /****************************************************************************/
 /* Reset the user_data structure */
-static void graph_analysis_init_dlg(graph_analysis_data_t* user_data)
+static void graph_analysis_init_dlg(graph_analysis_data_t *user_data)
 {
 	int i;
 	user_data->num_nodes = 0;
@@ -261,23 +261,23 @@ static void overwrite (GString *gstr, char *text_to_insert, guint32 p1, guint32
  */
 
 /****************************************************************************/
-static gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data)
+static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data)
 {
 	guint32 i, first_node, display_items, display_nodes;
 	guint32 start_position, end_position, item_width, header_length;
 	guint32 current_item;
 	graph_analysis_item_t *gai;
-	guint16 first_conv_num = 0;
+	guint16  first_conv_num = 0;
 	gboolean several_convs = FALSE;
-	gboolean first_packet = TRUE;
+	gboolean first_packet  = TRUE;
 
 	GString *label_string, *empty_line,*separator_line, *tmp_str, *tmp_str2;
-	char *empty_header;
-	char src_port[8],dst_port[8];
+	char    *empty_header;
+	char     src_port[8],dst_port[8];
 
-	GList* list;
+	GList *list;
 
-	FILE *of;
+	FILE  *of;
 
 	of = ws_fopen(user_data->dlg.save_file,"w");
 	if (of==NULL){
@@ -513,9 +513,7 @@ static void overwrite_existing_file_cb(gpointer dialog _U_, gint btn, gpointer u
 static gboolean save_to_file_ok_cb(GtkWidget *ok_bt _U_, gpointer user_data)
 {
 	FILE *file_test;
-	graph_analysis_data_t *user_data_p;
-
-	user_data_p = user_data;
+	graph_analysis_data_t *user_data_p = user_data;
 
 	user_data_p->dlg.save_file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_to_file_w));
 
@@ -610,7 +608,7 @@ on_save_bt_clicked                    (GtkWidget       *button _U_,
 }
 
 /****************************************************************************/
-static void dialog_graph_draw(graph_analysis_data_t* user_data)
+static void dialog_graph_draw(graph_analysis_data_t *user_data)
 {
 	guint32 i, last_item, first_item, display_items;
 	guint32 start_arrow, end_arrow, label_x, src_port_x, dst_port_x, arrow_width;
@@ -639,7 +637,7 @@ static void dialog_graph_draw(graph_analysis_data_t* user_data)
 	gint label_width, label_height;
 	guint32 draw_width, draw_height;
 	char label_string[MAX_COMMENT];
-	GList* list;
+	GList *list;
 
 	/* new variables */
 
@@ -1040,20 +1038,18 @@ static void dialog_graph_draw(graph_analysis_data_t* user_data)
 }
 
 /****************************************************************************/
-static void dialog_graph_redraw(graph_analysis_data_t* user_data)
+static void dialog_graph_redraw(graph_analysis_data_t *user_data)
 {
 	user_data->dlg.needs_redraw=TRUE;
 	dialog_graph_draw(user_data);
 }
 
 /****************************************************************************/
-static gint button_press_event(GtkWidget *widget, GdkEventButton *event _U_)
+static gboolean button_press_event(GtkWidget *widget _U_, GdkEventButton *event, gpointer data)
 {
-	graph_analysis_data_t *user_data;
+	graph_analysis_data_t *user_data = data;
 	guint32 item;
 
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-
 	if (event->type != GDK_BUTTON_PRESS) return TRUE;
 
 	if (event->y<TOP_Y_BORDER) return TRUE;
@@ -1072,11 +1068,9 @@ static gint button_press_event(GtkWidget *widget, GdkEventButton *event _U_)
 }
 
 /****************************************************************************/
-static gint scroll_event(GtkWidget *widget, GdkEventScroll *event)
+static gboolean scroll_event(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
+	graph_analysis_data_t *user_data = data;
 
 	/* Up scroll */
 	switch(event->direction) {
@@ -1105,11 +1099,9 @@ static gint scroll_event(GtkWidget *widget, GdkEventScroll *event)
 }
 
 /****************************************************************************/
-static gint key_press_event(GtkWidget *widget, GdkEventKey *event _U_)
+static gboolean key_press_event(GtkWidget *widget _U_, GdkEventKey *event, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
+	graph_analysis_data_t *user_data = data;
 
 	/* if there is nothing selected, just return */
 	if (user_data->dlg.selected_item == 0xFFFFFFFF) return TRUE;
@@ -1140,14 +1132,9 @@ static gint key_press_event(GtkWidget *widget, GdkEventKey *event _U_)
 }
 
 /****************************************************************************/
-static gint expose_event(GtkWidget *widget, GdkEventExpose *event)
+static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-	if(!user_data){
-		exit(10);
-	}
+	graph_analysis_data_t *user_data = data;
 
 	if (GDK_IS_DRAWABLE(widget->window))
 		gdk_draw_pixmap(widget->window,
@@ -1161,14 +1148,9 @@ static gint expose_event(GtkWidget *widget, GdkEventExpose *event)
 }
 
 /****************************************************************************/
-static gint expose_event_comments(GtkWidget *widget, GdkEventExpose *event)
+static gboolean expose_event_comments(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-	if(!user_data){
-		exit(10);
-	}
+	graph_analysis_data_t *user_data = data;
 
 	if (GDK_IS_DRAWABLE(widget->window))
 		gdk_draw_pixmap(widget->window,
@@ -1182,14 +1164,9 @@ static gint expose_event_comments(GtkWidget *widget, GdkEventExpose *event)
 }
 
 /****************************************************************************/
-static gint expose_event_time(GtkWidget *widget, GdkEventExpose *event)
+static gboolean expose_event_time(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-	if(!user_data){
-		exit(10);
-	}
+	graph_analysis_data_t *user_data = data;
 
 	if (GDK_IS_DRAWABLE(widget->window) )
 		gdk_draw_pixmap(widget->window,
@@ -1203,9 +1180,9 @@ static gint expose_event_time(GtkWidget *widget, GdkEventExpose *event)
 }
 
 /****************************************************************************/
-static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
+static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-        graph_analysis_data_t *user_data;
+        graph_analysis_data_t *user_data = data;
 	int i;
 
 	/* gray and soft gray colors */
@@ -1230,12 +1207,6 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
 		{0,     0xD3FF, 0xD3FF, 0xD3FF}
 	};
 
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-
-	if(!user_data){
-		exit(10);
-	}
-
 	if(user_data->dlg.pixmap_main){
 		gdk_pixmap_unref(user_data->dlg.pixmap_main);
 		user_data->dlg.pixmap_main=NULL;
@@ -1280,15 +1251,9 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
 }
 
 /****************************************************************************/
-static gint configure_event_comments(GtkWidget *widget, GdkEventConfigure *event _U_)
+static gboolean configure_event_comments(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-
-	if(!user_data){
-		exit(10);
-	}
+	graph_analysis_data_t *user_data = data;
 
 	if(user_data->dlg.pixmap_comments){
 		gdk_pixmap_unref(user_data->dlg.pixmap_comments);
@@ -1313,15 +1278,9 @@ static gint configure_event_comments(GtkWidget *widget, GdkEventConfigure *event
 }
 
 /****************************************************************************/
-static gint configure_event_time(GtkWidget *widget, GdkEventConfigure *event _U_)
+static gboolean configure_event_time(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data;
-
-	user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
-
-	if(!user_data){
-		exit(10);
-	}
+	graph_analysis_data_t *user_data = data;
 
 	if(user_data->dlg.pixmap_time){
 		gdk_pixmap_unref(user_data->dlg.pixmap_time);
@@ -1347,17 +1306,15 @@ static gint configure_event_time(GtkWidget *widget, GdkEventConfigure *event _U_
 }
 
 /****************************************************************************/
-static gint pane_callback(GtkWidget *widget, GParamSpec *pspec _U_, gpointer data)
+static gboolean pane_callback(GtkWidget *widget, GParamSpec *pspec _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data=(graph_analysis_data_t *)data;
+	graph_analysis_data_t *user_data = data;
 
-	if(!user_data){
-		exit(10);
-	}
 	if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) > user_data->dlg.pixmap_width)
 		gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), user_data->dlg.pixmap_width);
 	else if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) < NODE_WIDTH*2)
 		gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), NODE_WIDTH*2);
+
 	/* repaint the comment area because when moving the pane position there are times that the expose_event_comments is not called */
 	if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_comments->window))
 		gdk_draw_pixmap(user_data->dlg.draw_area_comments->window,
@@ -1372,28 +1329,27 @@ static gint pane_callback(GtkWidget *widget, GParamSpec *pspec _U_, gpointer dat
 }
 
 /****************************************************************************/
-static gint v_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
+static void v_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data=(graph_analysis_data_t *)data;
+	graph_analysis_data_t *user_data = data;
 
 	if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)
-		&& (user_data->dlg.v_scrollbar_adjustment->value >= user_data->dlg.first_item ))
-		return TRUE;
+	    && (user_data->dlg.v_scrollbar_adjustment->value >= user_data->dlg.first_item ))
+		return;
 
 	if (user_data->dlg.first_item == user_data->dlg.v_scrollbar_adjustment->value)
-		return TRUE;
+		return;
 
 	user_data->dlg.first_item = (guint32) user_data->dlg.v_scrollbar_adjustment->value;
 
 	dialog_graph_redraw(user_data);
 
-	return TRUE;
+	return;
 }
 
 /****************************************************************************/
-static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
+static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box)
 {
-	GtkWidget *vbox;
 	GtkWidget *hbox;
 	GtkWidget *viewport;
 	GtkWidget *scroll_window_comments;
@@ -1407,13 +1363,9 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 	hbox=gtk_hbox_new(FALSE, 0);
 	gtk_widget_show(hbox);
 
-	vbox=gtk_vbox_new(FALSE, 0);
-	gtk_widget_show(vbox);
-
 	/* create "time" draw area */
 	user_data->dlg.draw_area_time=gtk_drawing_area_new();
 	gtk_widget_set_size_request(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.pixmap_height);
-	g_object_set_data(G_OBJECT(user_data->dlg.draw_area_time), "graph_analysis_data_t", user_data);
 	frame_time = gtk_frame_new(NULL);
 	gtk_widget_show(frame_time);
 	gtk_container_add(GTK_CONTAINER(frame_time),user_data->dlg.draw_area_time);
@@ -1425,14 +1377,14 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 	gtk_widget_set_size_request(scroll_window_comments, (gint)(COMMENT_WIDTH/1.5), user_data->dlg.pixmap_height);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scroll_window_comments), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window_comments), GTK_SHADOW_ETCHED_IN);
-	viewport_comments = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)));
+	viewport_comments = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)),
+					     gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)));
 	gtk_container_add(GTK_CONTAINER(viewport_comments), user_data->dlg.draw_area_comments);
 	gtk_container_add(GTK_CONTAINER(scroll_window_comments), viewport_comments);
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport_comments), GTK_SHADOW_NONE);
-	g_object_set_data(G_OBJECT(user_data->dlg.draw_area_comments), "graph_analysis_data_t", user_data);
 	gtk_widget_add_events (user_data->dlg.draw_area_comments, GDK_BUTTON_PRESS_MASK);
-
 	g_signal_connect(user_data->dlg.draw_area_comments, "scroll_event",  G_CALLBACK(scroll_event), user_data);
+
 	/* create main Graph draw area */
 	user_data->dlg.draw_area=gtk_drawing_area_new();
 	if (user_data->num_nodes < 2)
@@ -1447,24 +1399,24 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 		gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window), GTK_SHADOW_ETCHED_IN);
-	viewport = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)));
+	viewport = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)),
+				    gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)));
 	gtk_container_add(GTK_CONTAINER(viewport), user_data->dlg.draw_area);
 	gtk_container_add(GTK_CONTAINER(user_data->dlg.scroll_window), viewport);
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-	g_object_set_data(G_OBJECT(user_data->dlg.draw_area), "graph_analysis_data_t", user_data);
 	GTK_WIDGET_SET_FLAGS(user_data->dlg.draw_area, GTK_CAN_FOCUS);
 	gtk_widget_grab_focus(user_data->dlg.draw_area);
 
 	/* signals needed to handle backing pixmap */
-	g_signal_connect(user_data->dlg.draw_area, "expose_event", G_CALLBACK(expose_event), NULL);
+	g_signal_connect(user_data->dlg.draw_area, "expose_event", G_CALLBACK(expose_event), user_data);
 	g_signal_connect(user_data->dlg.draw_area, "configure_event", G_CALLBACK(configure_event), user_data);
 
 	/* signals needed to handle backing pixmap comments */
-	g_signal_connect(user_data->dlg.draw_area_comments, "expose_event", G_CALLBACK(expose_event_comments), NULL);
+	g_signal_connect(user_data->dlg.draw_area_comments, "expose_event", G_CALLBACK(expose_event_comments), user_data);
 	g_signal_connect(user_data->dlg.draw_area_comments, "configure_event", G_CALLBACK(configure_event_comments), user_data);
 
 	/* signals needed to handle backing pixmap time */
-	g_signal_connect(user_data->dlg.draw_area_time, "expose_event", G_CALLBACK(expose_event_time), NULL);
+	g_signal_connect(user_data->dlg.draw_area_time, "expose_event", G_CALLBACK(expose_event_time), user_data);
 	g_signal_connect(user_data->dlg.draw_area_time, "configure_event", G_CALLBACK(configure_event_time), user_data);
 
 	gtk_widget_add_events (user_data->dlg.draw_area, GDK_BUTTON_PRESS_MASK);
@@ -1491,7 +1443,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 
 	gtk_box_pack_start(GTK_BOX(hbox), user_data->dlg.hpane, TRUE, TRUE, 0);
 
-	/* Create the vbox to include the vertical scroll and a box at the bottom */
+	/* Create the scroll_vbox to include the vertical scroll and a box at the bottom */
         scroll_vbox=gtk_vbox_new(FALSE, 0);
         gtk_widget_show(scroll_vbox);
 
@@ -1500,7 +1452,8 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 	user_data->dlg.v_scrollbar=gtk_vscrollbar_new(user_data->dlg.v_scrollbar_adjustment);
 	gtk_widget_show(user_data->dlg.v_scrollbar);
 	gtk_box_pack_start(GTK_BOX(scroll_vbox), user_data->dlg.v_scrollbar, TRUE, TRUE, 0);
-	g_signal_connect(user_data->dlg.v_scrollbar_adjustment, "value_changed", G_CALLBACK(v_scrollbar_changed), user_data);
+	g_signal_connect(user_data->dlg.v_scrollbar_adjustment, "value_changed", 
+                         G_CALLBACK(v_scrollbar_changed), user_data);
 
 	frame_box = gtk_frame_new(NULL);
 	gtk_widget_size_request(user_data->dlg.v_scrollbar, &scroll_requisition);
@@ -1513,13 +1466,13 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 	/* Frame around the main area */
 	frame = gtk_frame_new(NULL);
 	gtk_widget_show(frame);
-	gtk_container_add(GTK_CONTAINER(frame),hbox);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox),3);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
 
 	/*gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 15);*/
 	/*gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 15);*/
 	gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(box),10);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 10);
 }
 /****************************************************************************/
 /* PUBLIC */
@@ -1527,7 +1480,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 
 
 /****************************************************************************/
-static void dialog_graph_create_window(graph_analysis_data_t* user_data)
+static void dialog_graph_create_window(graph_analysis_data_t *user_data)
 {
 	GtkWidget *vbox;
 	GtkWidget *hbuttonbox;
@@ -1590,7 +1543,7 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
  * and Return -2 if the array is full
  */
 /****************************************************************************/
-static gint add_or_get_node(graph_analysis_data_t* user_data, address* node) {
+static gint add_or_get_node(graph_analysis_data_t *user_data, address *node) {
 	guint i;
 
 	if (node->type == AT_NONE) return NODE_OVERFLOW;
@@ -1610,9 +1563,9 @@ static gint add_or_get_node(graph_analysis_data_t* user_data, address* node) {
 
 /* Get the nodes from the list */
 /****************************************************************************/
-static void get_nodes(graph_analysis_data_t* user_data)
+static void get_nodes(graph_analysis_data_t *user_data)
 {
-	GList* list;
+	GList *list;
 	graph_analysis_item_t *gai;
 
 	/* fill the node array */
@@ -1635,9 +1588,9 @@ static void get_nodes(graph_analysis_data_t* user_data)
 }
 
 /****************************************************************************/
-graph_analysis_data_t* graph_analysis_init(void)
+graph_analysis_data_t *graph_analysis_init(void)
 {
-	graph_analysis_data_t* user_data;
+	graph_analysis_data_t *user_data;
 	/* init */
 	user_data = g_malloc(sizeof(graph_analysis_data_t));
 
@@ -1651,7 +1604,7 @@ graph_analysis_data_t* graph_analysis_init(void)
 /****************************************************************************/
 
 /****************************************************************************/
-void graph_analysis_create(graph_analysis_data_t* user_data)
+void graph_analysis_create(graph_analysis_data_t *user_data)
 {
 	/* reset the data */
 	graph_analysis_reset(user_data);
@@ -1669,7 +1622,7 @@ void graph_analysis_create(graph_analysis_data_t* user_data)
 }
 
 /****************************************************************************/
-void graph_analysis_update(graph_analysis_data_t* user_data)
+void graph_analysis_update(graph_analysis_data_t *user_data)
 {
 	/* reset the data */
 	graph_analysis_reset(user_data);
@@ -1693,13 +1646,13 @@ void graph_analysis_update(graph_analysis_data_t* user_data)
 
 
 /****************************************************************************/
-void graph_analysis_redraw(graph_analysis_data_t* user_data)
+void graph_analysis_redraw(graph_analysis_data_t *user_data)
 {
 	/* get nodes (each node is an address) */
 	get_nodes(user_data);
 
 	user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
-    gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+	gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
 	if (user_data->num_nodes < 6)
 		gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
 	else