General cleanup: whitespace, long-lines, & etc.

svn path=/trunk/; revision=47042

1 files changed, 400 insertions, 360 deletions

diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 3dc532e4b4..2615b6712c 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -119,52 +119,52 @@ static guint32 yscale_max[MAX_YSCALE] = {
 	1000000, 2000000, 5000000, 10000000, 20000000, 50000000
 };
 
-#define MAX_PIXELS_PER_TICK 4
+#define MAX_PIXELS_PER_TICK	      4
 #define DEFAULT_PIXELS_PER_TICK_INDEX 1
 static guint32 pixels_per_tick[MAX_PIXELS_PER_TICK] = {1, 2, 5, 10};
-static const char *graph_descr[4] = {
+static const char *graph_descr[4]		    = {
 	"Fwd Jitter", "Fwd Difference", "Rvr Jitter", "Rvr Difference"
 };
 /* unit is in ms */
-#define MAX_TICK_VALUES 5
-#define DEFAULT_TICK_VALUE_INDEX 1
-static guint tick_interval_values[MAX_TICK_VALUES] = { 1, 10, 100, 1000, 10000 };
+#define MAX_TICK_VALUES		      5
+#define DEFAULT_TICK_VALUE_INDEX      1
+static guint tick_interval_values[MAX_TICK_VALUES]  = { 1, 10, 100, 1000, 10000 };
 typedef struct _dialog_graph_graph_item_t {
 	guint32 value;
 	guint32 flags;
 } dialog_graph_graph_item_t;
 
 typedef struct _dialog_graph_graph_t {
-	struct _user_data_t *ud;
-	dialog_graph_graph_item_t items[NUM_GRAPH_ITEMS];
-	int plot_style;
-	gboolean display;
+	struct _user_data_t       *ud;
+	dialog_graph_graph_item_t  items[NUM_GRAPH_ITEMS];
+	int	   plot_style;
+	gboolean   display;
 	GtkWidget *display_button;
-	int hf_index;
-	GdkRGBA rgba_color;
-	GdkColor color;
-	gchar title[100];
+	int	   hf_index;
+	GdkRGBA	   rgba_color;
+	GdkColor   color;
+	gchar	   title[100];
 } dialog_graph_graph_t;
 
 
 typedef struct _dialog_graph_t {
 	gboolean needs_redraw;
-	gint32 interval;       /* measurement interval in ms */
-	guint32 last_interval;
-	guint32 max_interval;  /* XXX max_interval and num_items are redundant */
-	guint32 num_items;
-	double start_time;
+	gint32	 interval;      /* measurement interval in ms */
+	guint32	 last_interval;
+	guint32	 max_interval;  /* XXX max_interval and num_items are redundant */
+	guint32	 num_items;
+	double	 start_time;
 
 	struct _dialog_graph_graph_t graph[MAX_GRAPHS];
-	GtkWidget *window;
-	GtkWidget *draw_area;
+	GtkWidget       *window;
+	GtkWidget       *draw_area;
 #if GTK_CHECK_VERSION(2,22,0)
 	cairo_surface_t *surface;
 #else
-	GdkPixmap *pixmap;
+	GdkPixmap       *pixmap;
 #endif
-	GtkAdjustment *scrollbar_adjustment;
-	GtkWidget *scrollbar;
+	GtkAdjustment   *scrollbar_adjustment;
+	GtkWidget       *scrollbar;
 	int surface_width;
 	int surface_height;
 	int pixels_per_tick;
@@ -172,21 +172,21 @@ typedef struct _dialog_graph_t {
 } dialog_graph_t;
 
 typedef struct _dialog_data_t {
-	GtkWidget *window;
-	GtkWidget *list_fwd;
-	GtkTreeIter  iter;
-	GtkWidget *list_rev;
-	GtkWidget *label_stats_fwd;
-	GtkWidget *label_stats_rev;
-	GtkWidget *selected_list;
-	guint	number_of_nok;
+	GtkWidget	 *window;
+	GtkWidget	 *list_fwd;
+	GtkTreeIter	  iter;
+	GtkWidget	 *list_rev;
+	GtkWidget	 *label_stats_fwd;
+	GtkWidget	 *label_stats_rev;
+	GtkWidget	 *selected_list;
+	guint		  number_of_nok;
 	GtkTreeSelection *selected_list_sel;
-	gint selected_list_row;
-	GtkWidget *notebook;
-	GtkWidget *save_voice_as_w;
-	GtkWidget *save_csv_as_w;
-	gulong notebook_signal_id;
-	dialog_graph_t dialog_graph;
+	gint		  selected_list_row;
+	GtkWidget	 *notebook;
+	GtkWidget	 *save_voice_as_w;
+	GtkWidget	 *save_csv_as_w;
+	gulong		  notebook_signal_id;
+	dialog_graph_t	  dialog_graph;
 } dialog_data_t;
 
 #define OK_TEXT "[ Ok ]"
@@ -203,16 +203,16 @@ typedef enum {
 } error_type_t;
 
 typedef struct _tap_iax2_save_info_t {
-	FILE *fp;
-	guint32 count;
-	error_type_t error_type;
-	gboolean saved;
+	FILE	     *fp;
+	guint32	      count;
+	error_type_t  error_type;
+	gboolean      saved;
 } tap_iax2_save_info_t;
 
 
 /* structure that holds the information about the forward and reversed direction */
 struct _info_direction {
-	tap_iax2_stat_t statinfo;
+	tap_iax2_stat_t	     statinfo;
 	tap_iax2_save_info_t saveinfo;
 };
 
@@ -272,7 +272,7 @@ static void
 enable_graph(dialog_graph_graph_t *dgg)
 {
 
-	dgg->display=TRUE;
+	dgg->display = TRUE;
 
 }
 
@@ -371,46 +371,46 @@ iax2_packet_add_graph(dialog_graph_graph_t *dgg, tap_iax2_stat_t *statinfo, pack
 
 	/* we sometimes get called when dgg is disabled.
 	this is a bug since the tap listener should be removed first */
-	if(!dgg->display){
+	if (!dgg->display) {
 		return FALSE;
 	}
 
-	dgg->ud->dlg.dialog_graph.needs_redraw=TRUE;
+	dgg->ud->dlg.dialog_graph.needs_redraw = TRUE;
 
 	/*
 	* Find which interval this is supposed to go in and store the
 	* interval index as idx
 	*/
-	if (dgg->ud->dlg.dialog_graph.start_time == -1){ /* it is the first */
+	if (dgg->ud->dlg.dialog_graph.start_time == -1) { /* it is the first */
 		dgg->ud->dlg.dialog_graph.start_time = statinfo->start_time;
 	}
 	rtp_time = nstime_to_msec(&pinfo->fd->rel_ts) - dgg->ud->dlg.dialog_graph.start_time;
-	if(rtp_time<0){
+	if (rtp_time<0) {
 		return FALSE;
 	}
 	idx = (guint32)(rtp_time)/dgg->ud->dlg.dialog_graph.interval;
 
 	/* some sanity checks */
-	if(idx>=NUM_GRAPH_ITEMS){
+	if (idx >= NUM_GRAPH_ITEMS) {
 		return FALSE;
 	}
 
 	/* update num_items */
-	if(idx > dgg->ud->dlg.dialog_graph.num_items){
-		dgg->ud->dlg.dialog_graph.num_items=idx;
-		dgg->ud->dlg.dialog_graph.max_interval=idx*dgg->ud->dlg.dialog_graph.interval;
+	if (idx > dgg->ud->dlg.dialog_graph.num_items) {
+		dgg->ud->dlg.dialog_graph.num_items = idx;
+		dgg->ud->dlg.dialog_graph.max_interval = idx*dgg->ud->dlg.dialog_graph.interval;
 	}
 
 	/*
 	* Find the appropriate dialog_graph_graph_item_t structure
 	*/
-	it=&dgg->items[idx];
+	it = &dgg->items[idx];
 
 	/*
 	* Use the max value to highlight RTP problems
 	*/
 	if (value > it->value) {
-		it->value=value;
+		it->value = value;
 	}
 	it->flags = it->flags | statinfo->flags;
 
@@ -458,10 +458,10 @@ iax2_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, co
 		return FALSE;
 
 	/* is it the forward direction?  */
-	else if (CMP_ADDRESS(&(user_data->ip_src_fwd), &(pinfo->net_src)) == 0
-		 && user_data->port_src_fwd == pinfo->srcport
-		 && CMP_ADDRESS(&(user_data->ip_dst_fwd), &(pinfo->net_dst)) == 0
-		 && user_data->port_dst_fwd == pinfo->destport)  {
+	else if ((CMP_ADDRESS(&(user_data->ip_src_fwd), &(pinfo->net_src)) == 0)
+		 && (user_data->port_src_fwd == pinfo->srcport)
+		 && (CMP_ADDRESS(&(user_data->ip_dst_fwd), &(pinfo->net_dst)) == 0)
+		 && (user_data->port_dst_fwd == pinfo->destport))  {
 		iax2_packet_analyse(&(user_data->forward.statinfo), pinfo, iax2info);
 		iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_FWD_JITTER]),
 				      &(user_data->forward.statinfo),
@@ -523,7 +523,7 @@ int iax2_packet_analyse(tap_iax2_stat_t *statinfo,
 	current_time = nstime_to_sec(&pinfo->fd->rel_ts);
 	current_diff = fabs (current_time - statinfo->time - (((double)iax2info->timestamp - (double)statinfo->timestamp)/1000));
 	current_jitter = statinfo->jitter + ( current_diff - statinfo->jitter)/16;
-	statinfo->delta = current_time-(statinfo->time);
+	statinfo->delta = current_time - (statinfo->time);
 	statinfo->jitter = current_jitter;
 	statinfo->diff = current_diff;
 
@@ -531,10 +531,10 @@ int iax2_packet_analyse(tap_iax2_stat_t *statinfo,
 	statinfo->bw_history[statinfo->bw_index].bytes = iax2info->payload_len + 24;
 	statinfo->bw_history[statinfo->bw_index].time = current_time;
 	/* check if there are more than 1sec in the history buffer to calculate BW in bps. If so, remove those for the calculation */
-	while ((statinfo->bw_history[statinfo->bw_start_index].time+1)<current_time){
+	while ((statinfo->bw_history[statinfo->bw_start_index].time+1)<current_time) {
 	 	statinfo->total_bytes -= statinfo->bw_history[statinfo->bw_start_index].bytes;
 		statinfo->bw_start_index++;
-		if (statinfo->bw_start_index == BUFF_BW) statinfo->bw_start_index=0;
+		if (statinfo->bw_start_index == BUFF_BW) statinfo->bw_start_index = 0;
 	};
 	statinfo->total_bytes += iax2info->payload_len + 24;
 	statinfo->bandwidth = (double)(statinfo->total_bytes*8)/1000;
@@ -728,7 +728,7 @@ iax2_packet_save_payload(tap_iax2_save_info_t *saveinfo,
 			saveinfo->error_type = TAP_RTP_FILE_WRITE_ERROR;
 			return;
 		}
-		saveinfo->count+=iax2info->payload_len;
+		saveinfo->count += iax2info->payload_len;
 
 		if (fflush(saveinfo->fp) == EOF) {
 			/* Write error */
@@ -824,7 +824,7 @@ dialog_graph_set_title(user_data_t* user_data)
 {
 	char	*title;
 
-	if (!user_data->dlg.dialog_graph.window){
+	if (!user_data->dlg.dialog_graph.window) {
 		return;
 	}
 	title = g_strdup_printf("IAX2 Graph Analysis Forward: %s:%u to %s:%u   Reverse: %s:%u to %s:%u",
@@ -853,19 +853,19 @@ dialog_graph_reset(user_data_t* user_data)
 	for (i = 0; i < MAX_GRAPHS; i++) {
 		for (j = 0; j < NUM_GRAPH_ITEMS; j++) {
 			dialog_graph_graph_item_t *dggi;
-			dggi=&user_data->dlg.dialog_graph.graph[i].items[j];
+			dggi = &user_data->dlg.dialog_graph.graph[i].items[j];
 			dggi->value = 0;
 			dggi->flags = 0;
 		}
 	}
 	user_data->dlg.dialog_graph.last_interval = 0xffffffff;
-	user_data->dlg.dialog_graph.max_interval = 0;
-	user_data->dlg.dialog_graph.num_items=0;
+	user_data->dlg.dialog_graph.max_interval  = 0;
+	user_data->dlg.dialog_graph.num_items	  = 0;
 
 	/* create the color titles near the filter buttons */
 	for (i = 0; i < MAX_GRAPHS; i++) {
 		/* it is forward */
-		if (i < 2){
+		if (i < 2) {
 			g_snprintf(user_data->dlg.dialog_graph.graph[i].title,
 				   sizeof (user_data->dlg.dialog_graph.graph[0].title),
 				   "%s: %s:%u to %s:%u",
@@ -905,13 +905,13 @@ get_it_value(dialog_graph_graph_t *dgg, int idx)
 static void
 print_time_scale_string(char *buf, int buf_len, guint32 t)
 {
-	if (t >= 10000000){
+	if (t >= 10000000) {
 		g_snprintf(buf, buf_len, "%ds",t/1000000);
-	} else if (t >= 1000000){
+	} else if (t >= 1000000) {
 		g_snprintf(buf, buf_len, "%d.%03ds",t/1000000,(t%1000000)/1000);
-	} else if (t >= 10000){
+	} else if (t >= 10000) {
 		g_snprintf(buf, buf_len, "%dms",t/1000);
-	} else if (t >= 1000){
+	} else if (t >= 1000) {
 		g_snprintf(buf, buf_len, "%d.%03dms",t/1000,t%1000);
 	} else {
 		g_snprintf(buf, buf_len, "%dus",t);
@@ -922,30 +922,30 @@ print_time_scale_string(char *buf, int buf_len, guint32 t)
 static void
 dialog_graph_draw(user_data_t* user_data)
 {
-	int i, lwidth;
-	guint32 last_interval, first_interval, interval_delta, delta_multiplier;
-	gint32 current_interval;
-	guint32 left_x_border;
-	guint32 right_x_border;
-	guint32 top_y_border;
-	guint32 bottom_y_border;
-	PangoLayout  *layout;
-	int label_width, label_height;
-	int label_width_mid, label_height_mid;
-	guint32 draw_width, draw_height;
-	char label_string[15];
-	GtkAllocation widget_alloc;
-	cairo_t *cr;
+	int            i, lwidth;
+	guint32        last_interval, first_interval, interval_delta, delta_multiplier;
+	gint32         current_interval;
+	guint32        left_x_border;
+	guint32        right_x_border;
+	guint32        top_y_border;
+	guint32        bottom_y_border;
+	PangoLayout   *layout;
+	int            label_width, label_height;
+	int            label_width_mid, label_height_mid;
+	guint32        draw_width, draw_height;
+	char           label_string[15];
+	GtkAllocation  widget_alloc;
+	cairo_t       *cr;
 
 	/* new variables */
 	guint32 num_time_intervals;
 	guint32 max_value;		/* max value of seen data */
 	guint32 max_y;			/* max value of the Y scale */
 
-	if(!user_data->dlg.dialog_graph.needs_redraw){
+	if (!user_data->dlg.dialog_graph.needs_redraw) {
 		return;
 	}
-	user_data->dlg.dialog_graph.needs_redraw=FALSE;
+	user_data->dlg.dialog_graph.needs_redraw = FALSE;
 
 	/*
 	 * Find the length of the intervals we have data for
@@ -953,27 +953,28 @@ dialog_graph_draw(user_data_t* user_data)
 	 */
 	num_time_intervals = user_data->dlg.dialog_graph.num_items;
 	/* if there isnt anything to do, just return */
-	if(num_time_intervals == 0) {
+	if (num_time_intervals == 0) {
 		return;
 	}
-	num_time_intervals+=1;
+	num_time_intervals += 1;
 	/* XXX move this check to _packet() */
-	if (num_time_intervals>NUM_GRAPH_ITEMS){
-		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "IAX2 Graph error. There are too many entries, bailing out");
+	if (num_time_intervals>NUM_GRAPH_ITEMS) {
+		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+			      "IAX2 Graph error. There are too many entries, bailing out");
 		return;
 	}
 
 	/*
 	 * find the max value so we can autoscale the y axis
 	 */
-	max_value=0;
-	for (i = 0; i < MAX_GRAPHS; i++){
+	max_value = 0;
+	for (i = 0; i < MAX_GRAPHS; i++) {
 		int idx;
 
-		if (!user_data->dlg.dialog_graph.graph[i].display){
+		if (!user_data->dlg.dialog_graph.graph[i].display) {
 			continue;
 		}
-		for (idx = 0; (guint32) (idx) < num_time_intervals; idx++){
+		for (idx = 0; (guint32) (idx) < num_time_intervals; idx++) {
 			guint32 val;
 
 			val = get_it_value(&user_data->dlg.dialog_graph.graph[i], idx);
@@ -996,10 +997,10 @@ dialog_graph_draw(user_data_t* user_data)
 	cairo_set_source_rgb (cr, 1, 1, 1);
 	gtk_widget_get_allocation(user_data->dlg.dialog_graph.draw_area, &widget_alloc);
 	cairo_rectangle (cr,
-		0,
-		0,
-		widget_alloc.width,
-		widget_alloc.height);
+			 0,
+			 0,
+			 widget_alloc.width,
+			 widget_alloc.height);
 	cairo_fill (cr);
 	cairo_destroy (cr);
 
@@ -1007,10 +1008,10 @@ dialog_graph_draw(user_data_t* user_data)
 	/*
 	 * Calculate the y scale we should use
 	 */
-	if (user_data->dlg.dialog_graph.max_y_units == AUTO_MAX_YSCALE){
+	if (user_data->dlg.dialog_graph.max_y_units == AUTO_MAX_YSCALE) {
 		max_y = yscale_max[MAX_YSCALE-1];
-		for (i = MAX_YSCALE-1; i > 0; i--){
-			if(max_value < yscale_max[i]){
+		for (i = MAX_YSCALE-1; i > 0; i--) {
+			if (max_value < yscale_max[i]) {
 				max_y = yscale_max[i];
 			}
 		}
@@ -1031,21 +1032,21 @@ dialog_graph_draw(user_data_t* user_data)
 	layout = gtk_widget_create_pango_layout(user_data->dlg.dialog_graph.draw_area, label_string);
 	pango_layout_get_pixel_size(layout, &label_width_mid, &label_height_mid);
 	if (label_width_mid > label_width) {
-		label_width = label_width_mid;
+		label_width  = label_width_mid;
 		label_height = label_height_mid;
 	}
 
-	left_x_border=10;
-	right_x_border=label_width+20;
-	top_y_border=10;
-	bottom_y_border=label_height+20;
+	left_x_border = 10;
+	right_x_border = label_width+20;
+	top_y_border = 10;
+	bottom_y_border = label_height + 20;
 
 
 	/*
 	 * Calculate the size of the drawing area for the actual plot
 	 */
-	draw_width = user_data->dlg.dialog_graph.surface_width-right_x_border-left_x_border;
-	draw_height = user_data->dlg.dialog_graph.surface_height-top_y_border-bottom_y_border;
+	draw_width = user_data->dlg.dialog_graph.surface_width - right_x_border - left_x_border;
+	draw_height = user_data->dlg.dialog_graph.surface_height - top_y_border - bottom_y_border;
 
 
 	/*
@@ -1058,8 +1059,8 @@ dialog_graph_draw(user_data_t* user_data)
 	cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 	cairo_set_line_width (cr, 1.0);
-	cairo_move_to(cr, user_data->dlg.dialog_graph.surface_width-right_x_border+1.5, top_y_border+0.5);
-	cairo_line_to(cr, user_data->dlg.dialog_graph.surface_width-right_x_border+1.5, user_data->dlg.dialog_graph.surface_height-bottom_y_border+0.5);
+	cairo_move_to(cr, user_data->dlg.dialog_graph.surface_width - right_x_border+1.5, top_y_border+0.5);
+	cairo_line_to(cr, user_data->dlg.dialog_graph.surface_width - right_x_border+1.5, user_data->dlg.dialog_graph.surface_height - bottom_y_border+0.5);
 	cairo_stroke(cr);
 	cairo_destroy(cr);
 
@@ -1079,16 +1080,16 @@ dialog_graph_draw(user_data_t* user_data)
 #endif
 		cairo_set_line_width (cr, 1.0);
 		cairo_move_to(cr,
-			user_data->dlg.dialog_graph.surface_width-right_x_border+1.5,
-			user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10+0.5);
+			user_data->dlg.dialog_graph.surface_width - right_x_border+1.5,
+			user_data->dlg.dialog_graph.surface_height - bottom_y_border - draw_height*i/10+0.5);
 
 		cairo_line_to(cr,
-			user_data->dlg.dialog_graph.surface_width-right_x_border+1.5+xwidth,
-			user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10+0.5);
+			user_data->dlg.dialog_graph.surface_width - right_x_border+1.5 + xwidth,
+			user_data->dlg.dialog_graph.surface_height - bottom_y_border - draw_height*i/10+0.5);
 		cairo_stroke(cr);
 		cairo_destroy(cr);
 		/* draw the labels */
-		if (i == 0){
+		if (i == 0) {
 			print_time_scale_string(label_string, sizeof(label_string), (max_y*i/10));
 			pango_layout_set_text(layout, label_string, -1);
 			pango_layout_get_pixel_size(layout, &lwidth, NULL);
@@ -1098,13 +1099,13 @@ dialog_graph_draw(user_data_t* user_data)
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 			cairo_move_to (cr,
-				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth,
-				user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10-label_height/2);
+				user_data->dlg.dialog_graph.surface_width - right_x_border+15 + label_width - lwidth,
+				user_data->dlg.dialog_graph.surface_height - bottom_y_border - draw_height*i/10 - label_height/2);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
 			cr = NULL;
 		}
-		if(i==5){
+		if (i == 5) {
 			print_time_scale_string(label_string, sizeof(label_string), (max_y*i/10));
 			pango_layout_set_text(layout, label_string, -1);
 			pango_layout_get_pixel_size(layout, &lwidth, NULL);
@@ -1114,13 +1115,13 @@ dialog_graph_draw(user_data_t* user_data)
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 			cairo_move_to (cr,
-				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth,
-				user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10-label_height/2);
+				user_data->dlg.dialog_graph.surface_width - right_x_border+15 + label_width - lwidth,
+				user_data->dlg.dialog_graph.surface_height - bottom_y_border - draw_height*i/10 - label_height/2);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
 			cr = NULL;
 		}
-		if(i==10){
+		if (i == 10) {
 			print_time_scale_string(label_string, sizeof(label_string), (max_y*i/10));
 			pango_layout_set_text(layout, label_string, -1);
 			pango_layout_get_pixel_size(layout, &lwidth, NULL);
@@ -1130,8 +1131,8 @@ dialog_graph_draw(user_data_t* user_data)
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 			cairo_move_to (cr,
-				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth,
-				user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10-label_height/2);
+				user_data->dlg.dialog_graph.surface_width - right_x_border+15 + label_width - lwidth,
+				user_data->dlg.dialog_graph.surface_height - bottom_y_border - draw_height*i/10 - label_height/2);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
 			cr = NULL;
@@ -1145,15 +1146,12 @@ dialog_graph_draw(user_data_t* user_data)
 	 * then just pick the current end of the capture so that is scrolls
 	 * nicely when doing live captures
 	 */
-	if(user_data->dlg.dialog_graph.last_interval==0xffffffff){
-		last_interval=user_data->dlg.dialog_graph.max_interval;
+	if (user_data->dlg.dialog_graph.last_interval == 0xffffffff) {
+		last_interval = user_data->dlg.dialog_graph.max_interval;
 	} else {
-		last_interval=user_data->dlg.dialog_graph.last_interval;
+		last_interval = user_data->dlg.dialog_graph.last_interval;
 	}
 
-
-
-
 /*XXX*/
 	/* plot the x-scale */
 #if GTK_CHECK_VERSION(2,22,0)
@@ -1162,62 +1160,76 @@ dialog_graph_draw(user_data_t* user_data)
 	cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 	cairo_set_line_width (cr, 1.0);
-	cairo_move_to(cr, left_x_border+0.5, user_data->dlg.dialog_graph.surface_height-bottom_y_border+1.5);
-	cairo_line_to(cr, user_data->dlg.dialog_graph.surface_width-right_x_border+1.5,user_data->dlg.dialog_graph.surface_height-bottom_y_border+1.5);
+	cairo_move_to(cr,
+		      left_x_border+0.5,
+		      user_data->dlg.dialog_graph.surface_height - bottom_y_border+1.5);
+	cairo_line_to(cr,
+		      user_data->dlg.dialog_graph.surface_width - right_x_border+1.5,
+		      user_data->dlg.dialog_graph.surface_height - bottom_y_border+1.5);
 	cairo_stroke(cr);
 	cairo_destroy(cr);
 
-	if((last_interval/user_data->dlg.dialog_graph.interval)>draw_width/user_data->dlg.dialog_graph.pixels_per_tick+1){
-		first_interval=(last_interval/user_data->dlg.dialog_graph.interval)-draw_width/user_data->dlg.dialog_graph.pixels_per_tick+1;
-		first_interval*=user_data->dlg.dialog_graph.interval;
+	if ((last_interval/user_data->dlg.dialog_graph.interval) > draw_width/user_data->dlg.dialog_graph.pixels_per_tick+1) {
+		first_interval  = (last_interval/user_data->dlg.dialog_graph.interval)
+			- draw_width/user_data->dlg.dialog_graph.pixels_per_tick+1;
+		first_interval *= user_data->dlg.dialog_graph.interval;
 	} else {
-		first_interval=0;
+		first_interval = 0;
 	}
 
-	interval_delta=1;
-	delta_multiplier=5;
-	while(interval_delta<((last_interval-first_interval)/10)){
-		interval_delta*=delta_multiplier;
-		if(delta_multiplier==5){
-			delta_multiplier=2;
+	interval_delta   = 1;
+	delta_multiplier = 5;
+	while (interval_delta < ((last_interval - first_interval)/10)) {
+		interval_delta *= delta_multiplier;
+		if (delta_multiplier == 5) {
+			delta_multiplier = 2;
 		} else {
-			delta_multiplier=5;
+			delta_multiplier = 5;
 		}
 	}
 
-	for(current_interval=last_interval;current_interval>(gint32)first_interval;current_interval=current_interval-user_data->dlg.dialog_graph.interval){
+	for (current_interval = last_interval;
+	     current_interval > (gint32)first_interval;
+	     current_interval = current_interval - user_data->dlg.dialog_graph.interval) {
 		int x, xlen;
 
 		/* if pixels_per_tick is <5, only draw every 10 ticks */
-		if((user_data->dlg.dialog_graph.pixels_per_tick<10) && (current_interval%(10*user_data->dlg.dialog_graph.interval))){
+		if ((user_data->dlg.dialog_graph.pixels_per_tick < 10)
+		    && (current_interval % (10 * user_data->dlg.dialog_graph.interval))) {
 			continue;
 		}
 
-		if(current_interval%interval_delta){
-			xlen=5;
+		if (current_interval%interval_delta) {
+			xlen = 5;
 		} else {
-			xlen=17;
+			xlen = 17;
 		}
 
-		x=draw_width+left_x_border-((last_interval-current_interval)/user_data->dlg.dialog_graph.interval)*user_data->dlg.dialog_graph.pixels_per_tick;
+		x = draw_width + left_x_border
+			- (((last_interval - current_interval)/user_data->dlg.dialog_graph.interval)
+			   * user_data->dlg.dialog_graph.pixels_per_tick);
 #if GTK_CHECK_VERSION(2,22,0)
 		cr = cairo_create (user_data->dlg.dialog_graph.surface);
 #else
 		cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 		cairo_set_line_width (cr, 1.0);
-		cairo_move_to(cr, x-1-user_data->dlg.dialog_graph.pixels_per_tick/2+0.5, user_data->dlg.dialog_graph.surface_height-bottom_y_border+1.5);
-		cairo_line_to(cr, x-1-user_data->dlg.dialog_graph.pixels_per_tick/2+0.5, user_data->dlg.dialog_graph.surface_height-bottom_y_border+xlen+1.5);
+		cairo_move_to(cr,
+			      x - 1 - user_data->dlg.dialog_graph.pixels_per_tick/2 + 0.5,
+			      user_data->dlg.dialog_graph.surface_height - bottom_y_border + 1.5);
+		cairo_line_to(cr,
+			      x - 1 - user_data->dlg.dialog_graph.pixels_per_tick/2 + 0.5,
+			      user_data->dlg.dialog_graph.surface_height - bottom_y_border + xlen + 1.5);
 		cairo_stroke(cr);
 		cairo_destroy(cr);
 
-		if(xlen==17){
-			if(user_data->dlg.dialog_graph.interval>=1000){
+		if (xlen == 17) {
+			if (user_data->dlg.dialog_graph.interval >= 1000) {
 				g_snprintf(label_string, sizeof(label_string), "%ds", current_interval/1000);
-			} else if(user_data->dlg.dialog_graph.interval>=100){
+			} else if (user_data->dlg.dialog_graph.interval >= 100) {
 				g_snprintf(label_string, sizeof(label_string),
 					   "%d.%1ds", current_interval/1000,(current_interval/100)%10);
-			} else if(user_data->dlg.dialog_graph.interval>=10){
+			} else if (user_data->dlg.dialog_graph.interval >= 10) {
 				g_snprintf(label_string, sizeof(label_string),
 					   "%d.%2ds", current_interval/1000,(current_interval/10)%100);
 			} else {
@@ -1232,8 +1244,8 @@ dialog_graph_draw(user_data_t* user_data)
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 			cairo_move_to (cr,
-				x-1-user_data->dlg.dialog_graph.pixels_per_tick/2-lwidth/2,
-				user_data->dlg.dialog_graph.surface_height-bottom_y_border+20);
+				       x - 1 - user_data->dlg.dialog_graph.pixels_per_tick/2 - lwidth/2,
+				       user_data->dlg.dialog_graph.surface_height - bottom_y_border + 20);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
 			cr = NULL;
@@ -1241,11 +1253,6 @@ dialog_graph_draw(user_data_t* user_data)
 
 	}
 
-
-
-
-
-
 	/*
 	 * Draw "x" for Sequence Errors and "m" for Marks
 	 */
@@ -1259,8 +1266,8 @@ dialog_graph_draw(user_data_t* user_data)
 	cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 	cairo_move_to (cr,
-		user_data->dlg.dialog_graph.surface_width-right_x_border+33-lwidth,
-		user_data->dlg.dialog_graph.surface_height-bottom_y_border+3);
+		user_data->dlg.dialog_graph.surface_width - right_x_border+33 - lwidth,
+		user_data->dlg.dialog_graph.surface_height - bottom_y_border+3);
 	pango_cairo_show_layout (cr, layout);
 	cairo_destroy (cr);
 	cr = NULL;
@@ -1274,29 +1281,36 @@ dialog_graph_draw(user_data_t* user_data)
 	cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 	cairo_move_to (cr,
-		user_data->dlg.dialog_graph.surface_width-right_x_border+33-lwidth,
-		user_data->dlg.dialog_graph.surface_height-bottom_y_border+3+9);
+		user_data->dlg.dialog_graph.surface_width - right_x_border+33 - lwidth,
+		user_data->dlg.dialog_graph.surface_height - bottom_y_border+3+9);
 	pango_cairo_show_layout (cr, layout);
 	cairo_destroy (cr);
 	cr = NULL;
 
 	/* Draw the marks */
-	for(i=MAX_GRAPHS-1;i>=0;i--){
+	for (i = MAX_GRAPHS-1; i >= 0; i--) {
 		guint32 interval;
 		guint32 x_pos/*, prev_x_pos*/;
 
 		/* XXX for fwd or rev, the flag info for jitter and diff is the same, and here I loop twice */
-		if (!user_data->dlg.dialog_graph.graph[i].display){
+		if (!user_data->dlg.dialog_graph.graph[i].display) {
 			continue;
 		}
 		/* initialize prev x/y to the low left corner of the graph */
 		/* prev_x_pos=draw_width-1-user_data->dlg.dialog_graph.pixels_per_tick*((last_interval-first_interval)/user_data->dlg.dialog_graph.interval+1)+left_x_border; */
 
-		for(interval=first_interval+user_data->dlg.dialog_graph.interval;interval<=last_interval;interval+=user_data->dlg.dialog_graph.interval){
-			x_pos=draw_width-1-user_data->dlg.dialog_graph.pixels_per_tick*((last_interval-interval)/user_data->dlg.dialog_graph.interval+1)+left_x_border;
-
-			if(user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags & (STAT_FLAG_WRONG_SEQ|STAT_FLAG_MARKER)){
-				if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags & STAT_FLAG_WRONG_SEQ){
+		for (interval = first_interval + user_data->dlg.dialog_graph.interval;
+		     interval <= last_interval;
+		     interval += user_data->dlg.dialog_graph.interval) {
+			x_pos = draw_width - 1
+				- (user_data->dlg.dialog_graph.pixels_per_tick
+				   * ((last_interval - interval)/user_data->dlg.dialog_graph.interval+1))
+				+ left_x_border;
+
+			if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags
+			    & (STAT_FLAG_WRONG_SEQ|STAT_FLAG_MARKER)) {
+				if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags
+				    & STAT_FLAG_WRONG_SEQ) {
 					g_strlcpy(label_string, "x", sizeof(label_string));
 				} else {
 					g_strlcpy(label_string, "m", sizeof(label_string));
@@ -1310,14 +1324,14 @@ dialog_graph_draw(user_data_t* user_data)
 				cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 				cairo_move_to (cr,
-					x_pos-1-lwidth/2,
-					user_data->dlg.dialog_graph.surface_height-bottom_y_border+3+7*(i/2));
+					x_pos - 1 - lwidth/2,
+					user_data->dlg.dialog_graph.surface_height - bottom_y_border+3+7*(i/2));
 				pango_cairo_show_layout (cr, layout);
 				cairo_destroy (cr);
 				cr = NULL;
 			}
 
-			/* prev_x_pos=x_pos; */
+			/* prev_x_pos = x_pos; */
 		}
 	}
 
@@ -1326,36 +1340,42 @@ dialog_graph_draw(user_data_t* user_data)
 	/*
 	 * Loop over all graphs and draw them
 	 */
-	for(i=MAX_GRAPHS-1;i>=0;i--){
+	for(i = MAX_GRAPHS-1; i >= 0; i--) {
 		guint32 interval;
 		guint32 x_pos, y_pos, /*prev_x_pos,*/ prev_y_pos;
-		if (!user_data->dlg.dialog_graph.graph[i].display){
+		if (!user_data->dlg.dialog_graph.graph[i].display) {
 			continue;
 		}
 		/* initialize prev x/y to the low left corner of the graph */
 		/* prev_x_pos=draw_width-1-user_data->dlg.dialog_graph.pixels_per_tick*((last_interval-first_interval)/user_data->dlg.dialog_graph.interval+1)+left_x_border; */
-		prev_y_pos=draw_height-1+top_y_border;
+		prev_y_pos = draw_height-1 + top_y_border;
 
-		for(interval=first_interval+user_data->dlg.dialog_graph.interval;interval<=last_interval;interval+=user_data->dlg.dialog_graph.interval){
+		for (interval = first_interval + user_data->dlg.dialog_graph.interval;
+		     interval <= last_interval;
+		     interval += user_data->dlg.dialog_graph.interval) {
 			guint32 val;
-			x_pos=draw_width-1-user_data->dlg.dialog_graph.pixels_per_tick*((last_interval-interval)/user_data->dlg.dialog_graph.interval+1)+left_x_border;
-			val=get_it_value(&user_data->dlg.dialog_graph.graph[i], interval/user_data->dlg.dialog_graph.interval);
-			if(val>max_y){
-				y_pos=0;
+			x_pos = draw_width - 1
+				- (user_data->dlg.dialog_graph.pixels_per_tick
+				   * ((last_interval - interval)/user_data->dlg.dialog_graph.interval+1))
+				+ left_x_border;
+			val = get_it_value(&user_data->dlg.dialog_graph.graph[i],
+					   interval/user_data->dlg.dialog_graph.interval);
+			if (val > max_y) {
+				y_pos = 0;
 			} else {
-				y_pos=draw_height-1-(val*draw_height)/max_y+top_y_border;
+				y_pos = draw_height-1 - (val*draw_height)/max_y + top_y_border;
 			}
 
 			/* dont need to draw anything if the segment
 			 * is entirely above the top of the graph
 			 */
-			if( (prev_y_pos==0) && (y_pos==0) ){
-				prev_y_pos=y_pos;
-				/* prev_x_pos=x_pos; */
+			if ( (prev_y_pos == 0) && (y_pos == 0) ) {
+				prev_y_pos = y_pos;
+				/* prev_x_pos = x_pos; */
 				continue;
 			}
 
-			if(val){
+			if (val) {
 #if GTK_CHECK_VERSION(2,22,0)
 				cr = cairo_create (user_data->dlg.dialog_graph.surface);
 #else
@@ -1363,14 +1383,14 @@ dialog_graph_draw(user_data_t* user_data)
 #endif
 				gdk_cairo_set_source_rgba (cr, &user_data->dlg.dialog_graph.graph[i].rgba_color);
 				cairo_set_line_width (cr, 1.0);
-				cairo_move_to(cr, x_pos+0.5, draw_height-1+top_y_border+0.5);
+				cairo_move_to(cr, x_pos+0.5, draw_height-1 + top_y_border+0.5);
 				cairo_line_to(cr, x_pos+0.5, y_pos+0.5);
 				cairo_stroke(cr);
 				cairo_destroy(cr);
 			}
 
-			prev_y_pos=y_pos;
-			/* prev_x_pos=x_pos; */
+			prev_y_pos = y_pos;
+			/* prev_x_pos = x_pos; */
 		}
 	}
 
@@ -1389,15 +1409,22 @@ dialog_graph_draw(user_data_t* user_data)
 
 
 	/* update the scrollbar */
-	gtk_adjustment_set_upper(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) user_data->dlg.dialog_graph.max_interval);
-	gtk_adjustment_set_step_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) ((last_interval-first_interval)/10));
-	gtk_adjustment_set_page_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
-	if((last_interval-first_interval)*100 < user_data->dlg.dialog_graph.max_interval){
-		gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (user_data->dlg.dialog_graph.max_interval/100));
+	gtk_adjustment_set_upper(user_data->dlg.dialog_graph.scrollbar_adjustment,
+				 (gfloat) user_data->dlg.dialog_graph.max_interval);
+	gtk_adjustment_set_step_increment(user_data->dlg.dialog_graph.scrollbar_adjustment,
+					  (gfloat) ((last_interval - first_interval)/10));
+	gtk_adjustment_set_page_increment(user_data->dlg.dialog_graph.scrollbar_adjustment,
+					  (gfloat) (last_interval - first_interval));
+	if ((last_interval - first_interval)*100 < user_data->dlg.dialog_graph.max_interval) {
+		gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment,
+					     (gfloat) (user_data->dlg.dialog_graph.max_interval/100));
 	} else {
-		gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
+		gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment,
+					     (gfloat) (last_interval - first_interval));
 	}
-	gtk_adjustment_set_value(user_data->dlg.dialog_graph.scrollbar_adjustment, last_interval - gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
+	gtk_adjustment_set_value(user_data->dlg.dialog_graph.scrollbar_adjustment,
+				 last_interval
+				 - gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
 	gtk_adjustment_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
 	gtk_adjustment_value_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
 
@@ -1407,7 +1434,7 @@ dialog_graph_draw(user_data_t* user_data)
 static void
 dialog_graph_redraw(user_data_t* user_data)
 {
-	user_data->dlg.dialog_graph.needs_redraw=TRUE;
+	user_data->dlg.dialog_graph.needs_redraw = TRUE;
 	dialog_graph_draw(user_data);
 }
 
@@ -1426,8 +1453,8 @@ draw_area_destroy_cb(GtkWidget *widget _U_, gpointer data)
 static
 gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-	user_data_t *user_data = data;
-	GtkAllocation allocation;
+	user_data_t   *user_data = data;
+	GtkAllocation  allocation;
 
 	gtk_widget_get_allocation (widget, &allocation);
 
@@ -1442,7 +1469,7 @@ static gboolean
 draw_area_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	user_data_t *user_data = data;
-	cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
+	cairo_t	    *cr	       = gdk_cairo_create (gtk_widget_get_window(widget));
 
 #if GTK_CHECK_VERSION(2,22,0)
 	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0);
@@ -1461,14 +1488,14 @@ draw_area_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 static gboolean
 draw_area_configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-	user_data_t *user_data = data;
-	GtkAllocation widget_alloc;
-	cairo_t *cr;
+	user_data_t   *user_data = data;
+	GtkAllocation  widget_alloc;
+	cairo_t	      *cr;
 
 #if GTK_CHECK_VERSION(2,22,0)
-	if(user_data->dlg.dialog_graph.surface){
+	if (user_data->dlg.dialog_graph.surface) {
 		g_object_unref(user_data->dlg.dialog_graph.surface);
-		user_data->dlg.dialog_graph.surface=NULL;
+		user_data->dlg.dialog_graph.surface = NULL;
 	}
 	gtk_widget_get_allocation(widget, &widget_alloc);
 	user_data->dlg.dialog_graph.surface = gdk_window_create_similar_surface (gtk_widget_get_window(widget),
@@ -1476,19 +1503,19 @@ draw_area_configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpoin
 			widget_alloc.width,
 			widget_alloc.height);
 #else
-	if(user_data->dlg.dialog_graph.pixmap){
+	if (user_data->dlg.dialog_graph.pixmap) {
 		g_object_unref(user_data->dlg.dialog_graph.pixmap);
-		user_data->dlg.dialog_graph.pixmap=NULL;
+		user_data->dlg.dialog_graph.pixmap = NULL;
 	}
 
 	gtk_widget_get_allocation(widget, &widget_alloc);
-	user_data->dlg.dialog_graph.pixmap=gdk_pixmap_new(gtk_widget_get_window(widget),
+	user_data->dlg.dialog_graph.pixmap = gdk_pixmap_new(gtk_widget_get_window(widget),
 			widget_alloc.width,
 			widget_alloc.height,
 			-1);
 #endif
-	user_data->dlg.dialog_graph.surface_width=widget_alloc.width;
-	user_data->dlg.dialog_graph.surface_height=widget_alloc.height;
+	user_data->dlg.dialog_graph.surface_width = widget_alloc.width;
+	user_data->dlg.dialog_graph.surface_height = widget_alloc.height;
 
 #if GTK_CHECK_VERSION(2,22,0)
 	cr = cairo_create (user_data->dlg.dialog_graph.surface);
@@ -1509,18 +1536,19 @@ static void
 scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 {
 	user_data_t *user_data = data;
-	guint32 mi;
+	guint32	     mi;
 
-	mi=(guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment) + gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
-	if(user_data->dlg.dialog_graph.last_interval==mi){
+	mi = (guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment)
+			+ gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
+	if (user_data->dlg.dialog_graph.last_interval == mi) {
 		return;
 	}
-	if( (user_data->dlg.dialog_graph.last_interval==0xffffffff)
-	    &&  (mi==user_data->dlg.dialog_graph.max_interval) ){
+	if ( (user_data->dlg.dialog_graph.last_interval == 0xffffffff)
+	    &&  (mi == user_data->dlg.dialog_graph.max_interval) ) {
 		return;
 	}
 
-	user_data->dlg.dialog_graph.last_interval=(mi/user_data->dlg.dialog_graph.interval)*user_data->dlg.dialog_graph.interval;
+	user_data->dlg.dialog_graph.last_interval = (mi/user_data->dlg.dialog_graph.interval)*user_data->dlg.dialog_graph.interval;
 
 	dialog_graph_redraw(user_data);
 	return;
@@ -1530,7 +1558,7 @@ scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 static void
 create_draw_area(user_data_t* user_data, GtkWidget *box)
 {
-	user_data->dlg.dialog_graph.draw_area=gtk_drawing_area_new();
+	user_data->dlg.dialog_graph.draw_area = gtk_drawing_area_new();
 	g_signal_connect(user_data->dlg.dialog_graph.draw_area, "destroy", G_CALLBACK(draw_area_destroy_cb), user_data);
 
 	gtk_widget_set_size_request(user_data->dlg.dialog_graph.draw_area, user_data->dlg.dialog_graph.surface_width, user_data->dlg.dialog_graph.surface_height);
@@ -1547,8 +1575,8 @@ create_draw_area(user_data_t* user_data, GtkWidget *box)
 	gtk_box_pack_start(GTK_BOX(box), user_data->dlg.dialog_graph.draw_area, TRUE, TRUE, 0);
 
 	/* create the associated scrollbar */
-	user_data->dlg.dialog_graph.scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
-	user_data->dlg.dialog_graph.scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL,user_data->dlg.dialog_graph.scrollbar_adjustment);
+	user_data->dlg.dialog_graph.scrollbar_adjustment = (GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
+	user_data->dlg.dialog_graph.scrollbar = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL,user_data->dlg.dialog_graph.scrollbar_adjustment);
 	gtk_widget_show(user_data->dlg.dialog_graph.scrollbar);
 	gtk_box_pack_start(GTK_BOX(box), user_data->dlg.dialog_graph.scrollbar, FALSE, FALSE, 0);
 	g_signal_connect(user_data->dlg.dialog_graph.scrollbar_adjustment, "value_changed", G_CALLBACK(scrollbar_changed), user_data);
@@ -1559,7 +1587,7 @@ static void
 disable_graph(dialog_graph_graph_t *dgg)
 {
 	if (dgg->display) {
-		dgg->display=FALSE;
+		dgg->display = FALSE;
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dgg->display_button),
 		    FALSE);
 	}
@@ -1572,7 +1600,7 @@ filter_box_display_button_cb(GtkWidget *widget _U_, gpointer data)
 	dialog_graph_graph_t *dgg = data;
 
 	/* this graph is not active, just update display and redraw */
-	if(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dgg->display_button))){
+	if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dgg->display_button))) {
 		disable_graph(dgg);
 		dialog_graph_redraw(dgg->ud);
 		return;
@@ -1591,7 +1619,7 @@ create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num)
 {
 	GtkWidget *hbox;
 	GtkWidget *label;
-	char str[256];
+	char	   str[256];
 
 	hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
@@ -1605,7 +1633,7 @@ create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num)
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dgg->display_button), dgg->display);
 	g_signal_connect(dgg->display_button, "toggled", G_CALLBACK(filter_box_display_button_cb), dgg);
 
-	label=gtk_label_new(dgg->title);
+	label = gtk_label_new(dgg->title);
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 #if GTK_CHECK_VERSION(3,0,0)
@@ -1631,7 +1659,7 @@ create_filter_area(user_data_t* user_data, GtkWidget *box)
 {
 	GtkWidget *frame;
 	GtkWidget *vbox;
-	int i;
+	int	   i;
 	GtkWidget *label;
 
 	frame = gtk_frame_new("Graphs");
@@ -1659,7 +1687,7 @@ create_filter_area(user_data_t* user_data, GtkWidget *box)
 static void
 yscale_select(GtkWidget *item, gpointer data)
 {
-	int i;
+	int	     i;
 	user_data_t *user_data = data;
 
 	i = gtk_combo_box_get_active (GTK_COMBO_BOX(item));
@@ -1672,7 +1700,7 @@ yscale_select(GtkWidget *item, gpointer data)
 static void
 pixels_per_tick_select(GtkWidget *item, gpointer data)
 {
-	int i;
+	int	     i;
 	user_data_t *user_data = data;
 
 	i = gtk_combo_box_get_active (GTK_COMBO_BOX(item));
@@ -1686,11 +1714,11 @@ static void
 tick_interval_select(GtkWidget *item, gpointer data)
 {
 	user_data_t *user_data = data;
-	int i;
+	int	     i;
 
 	i = gtk_combo_box_get_active (GTK_COMBO_BOX(item));
 
-	user_data->dlg.dialog_graph.interval=tick_interval_values[i];
+	user_data->dlg.dialog_graph.interval = tick_interval_values[i];
 	cf_retap_packets(&cfile);
 	dialog_graph_redraw(user_data);
 }
@@ -1699,14 +1727,14 @@ tick_interval_select(GtkWidget *item, gpointer data)
 static GtkWidget *
 create_yscale_max_menu_items(user_data_t* user_data)
 {
-	char str[15];
+	char	   str[15];
 	GtkWidget *combo_box;
-	int i;
+	int	   i;
 
 	combo_box = gtk_combo_box_text_new();
 
 	for (i = 0; i < MAX_YSCALE; i++) {
-		if(yscale_max[i]==AUTO_MAX_YSCALE){
+		if (yscale_max[i] == AUTO_MAX_YSCALE) {
 			g_strlcpy(str,"Auto",sizeof(str));
 		} else if (yscale_max[i] < 1000000) {
 			g_snprintf(str, sizeof(str), "%u ms", yscale_max[i]/1000);
@@ -1725,13 +1753,13 @@ create_yscale_max_menu_items(user_data_t* user_data)
 static GtkWidget *
 create_pixels_per_tick_menu_items(user_data_t *user_data)
 {
-	char str[5];
+	char	   str[5];
 	GtkWidget *combo_box;
-	int i;
+	int	   i;
 
 	combo_box = gtk_combo_box_text_new();
 
-	for(i=0;i<MAX_PIXELS_PER_TICK;i++){
+	for(i = 0; i < MAX_PIXELS_PER_TICK; i++) {
 		g_snprintf(str, sizeof(str), "%u", pixels_per_tick[i]);
 		 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
 	}
@@ -1747,17 +1775,17 @@ static GtkWidget *
 create_tick_interval_menu_items(user_data_t *user_data)
 {
 	GtkWidget *combo_box;
-	char str[15];
-	int i;
+	char	   str[15];
+	int	   i;
 
 	combo_box = gtk_combo_box_text_new();
 
-	for(i=0;i<MAX_TICK_VALUES;i++){
-		if(tick_interval_values[i]>=1000){
+	for(i = 0; i < MAX_TICK_VALUES; i++) {
+		if (tick_interval_values[i] >= 1000) {
 			g_snprintf(str, sizeof(str), "%u sec", tick_interval_values[i]/1000);
-		} else if(tick_interval_values[i]>=100){
+		} else if (tick_interval_values[i] >= 100) {
 			g_snprintf(str, sizeof(str), "0.%1u sec", (tick_interval_values[i]/100)%10);
-		} else if(tick_interval_values[i]>=10){
+		} else if (tick_interval_values[i] >= 10) {
 			g_snprintf(str, sizeof(str), "0.%02u sec", (tick_interval_values[i]/10)%10);
 		} else {
 			g_snprintf(str, sizeof(str), "0.%03u sec", (tick_interval_values[i])%10);
@@ -1840,7 +1868,7 @@ dialog_graph_init_window(user_data_t* user_data)
 	GtkWidget *bt_close;
 
 	/* create the main window */
-	user_data->dlg.dialog_graph.window=dlg_window_new("I/O Graphs");   /* transient_for top_level */
+	user_data->dlg.dialog_graph.window = dlg_window_new("I/O Graphs");   /* transient_for top_level */
 
 	vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
 	gtk_container_add(GTK_CONTAINER(user_data->dlg.dialog_graph.window), vbox);
@@ -1894,18 +1922,18 @@ on_graph_bt_clicked(GtkWidget *bt _U_, gpointer data)
 static void
 on_goto_bt_clicked(GtkWidget *bt _U_, gpointer data)
 {
-	user_data_t *user_data = data;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
+	user_data_t	 *user_data = data;
+	GtkTreeIter	  iter;
+	GtkTreeModel	 *model;
 	GtkTreeSelection *selection;
-	guint fnumber;
+	guint		  fnumber;
 
 	selection = user_data->dlg.selected_list_sel;
 
-	if (selection==NULL)
+	if (selection == NULL)
 		return;
 
-	if (gtk_tree_selection_get_selected (selection, &model, &iter)){
+	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		gtk_tree_model_get (model, &iter, PACKET_COLUMN, &fnumber, -1);
 		cf_goto_frame(&cfile, fnumber);
 	}
@@ -1920,7 +1948,7 @@ static void
 on_refresh_bt_clicked(GtkWidget *bt _U_, gpointer data)
 {
 	user_data_t *user_data = data;
-	GString *error_string;
+	GString	    *error_string;
 
 	/* remove tap listener */
 	remove_tap_listener(user_data);
@@ -1946,20 +1974,20 @@ on_refresh_bt_clicked(GtkWidget *bt _U_, gpointer data)
 static void
 on_next_bt_clicked(GtkWidget *bt _U_, gpointer data)
 {
-	user_data_t *user_data = data;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	gchar *text;
+	user_data_t	 *user_data = data;
+	GtkTreeIter	  iter;
+	GtkTreeModel	 *model;
+	gchar		 *text;
 	GtkTreeSelection *selection;
-	GtkTreePath *path;
+	GtkTreePath	 *path;
 
 	selection = user_data->dlg.selected_list_sel;
 
-	if (selection==NULL)
+	if (selection == NULL)
 		return;
 
 try_again:
-	if (gtk_tree_selection_get_selected (selection, &model, &iter)){
+	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		while (gtk_tree_model_iter_next (model,&iter)) {
 			gtk_tree_model_get (model, &iter, STATUS_COLUMN, &text, -1);
 			if (strcmp(text, OK_TEXT) != 0) {
@@ -1975,7 +2003,7 @@ try_again:
 			g_free (text);
 		}
 		/* wrap around */
-		if (user_data->dlg.number_of_nok>1){
+		if (user_data->dlg.number_of_nok>1) {
 			/* Get the first iter and select it before starting over */
 			gtk_tree_model_get_iter_first(model, &iter);
 			gtk_tree_selection_select_iter (selection, &iter);
@@ -2028,7 +2056,8 @@ save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *user_data*/)
 	both = (GtkWidget*)g_object_get_data(G_OBJECT(fc), "both_rb");
 	user_data = (user_data_t*)g_object_get_data(G_OBJECT(fc), "user_data");
 
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(forw)) || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(forw))
+	    || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
 		fp = ws_fopen(g_dest, "w");
 		if (fp == NULL) {
 			open_failure_alert_box(g_dest, errno, TRUE);
@@ -2062,7 +2091,7 @@ save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *user_data*/)
 		}
 		model = gtk_tree_view_get_model(GTK_TREE_VIEW(user_data->dlg.list_fwd));
 		store = GTK_LIST_STORE(model);
-		if( gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter) ) {
+		if ( gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter) ) {
 
 			while (more_items) {
 				gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
@@ -2142,7 +2171,7 @@ save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *user_data*/)
 		}
 		model = gtk_tree_view_get_model(GTK_TREE_VIEW(user_data->dlg.list_rev));
 		store = GTK_LIST_STORE(model);
-		if( gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter) ) {
+		if ( gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter) ) {
 
 			more_items = TRUE;
 
@@ -2198,13 +2227,13 @@ static void
 save_csv_as_cb(GtkWidget *bt _U_, gpointer data)
 {
 	user_data_t *user_data = data;
-	GtkWidget *vertb;
-	GtkWidget *grid1;
-	GtkWidget *label_format;
-	GtkWidget *channels_label;
-	GtkWidget *forward_rb;
-	GtkWidget *reversed_rb;
-	GtkWidget *both_rb;
+	GtkWidget   *vertb;
+	GtkWidget   *grid1;
+	GtkWidget   *label_format;
+	GtkWidget   *channels_label;
+	GtkWidget   *forward_rb;
+	GtkWidget   *reversed_rb;
+	GtkWidget   *both_rb;
 
 #if 0  /* XXX: GtkFileChooserDialog/gtk_dialog_run currently being used is effectively modal so this is not req'd */
 	if (user_data->dlg.save_csv_as_w != NULL) {
@@ -2421,20 +2450,20 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 				progbar_count = user_data->forward.saveinfo.count;
 				progbar_quantum = user_data->forward.saveinfo.count/100;
 				while ((fread_cnt = read(forw_fd, f_pd, 1)) > 0) {
-					if(stop_flag)
+					if (stop_flag)
 						break;
-					if((count > progbar_nextstep) && (count <= progbar_count)) {
+					if ((count > progbar_nextstep) && (count <= progbar_count)) {
 						update_progress_dlg(progbar,
 							(gfloat) count/progbar_count, "Saving");
 						progbar_nextstep = progbar_nextstep + progbar_quantum;
 					}
 					count++;
 
-					if (user_data->forward.statinfo.pt == AST_FORMAT_ULAW){
+					if (user_data->forward.statinfo.pt == AST_FORMAT_ULAW) {
 						sample = ulaw2linear(*f_pd);
 						phtons(pd, sample);
 					}
-					else if(user_data->forward.statinfo.pt == AST_FORMAT_ALAW){
+					else if (user_data->forward.statinfo.pt == AST_FORMAT_ALAW) {
 						sample = alaw2linear(*f_pd);
 						phtons(pd, sample);
 					}
@@ -2459,23 +2488,23 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 			}
 			/* only reversed direction */
 			case SAVE_REVERSE_DIRECTION_MASK: {
-				progbar_count = user_data->reversed.saveinfo.count;
+				progbar_count   = user_data->reversed.saveinfo.count;
 				progbar_quantum = user_data->reversed.saveinfo.count/100;
 				while ((rread = read(rev_fd, r_pd, 1)) > 0) {
-					if(stop_flag)
+					if (stop_flag)
 						break;
-					if((count > progbar_nextstep) && (count <= progbar_count)) {
+					if ((count > progbar_nextstep) && (count <= progbar_count)) {
 						update_progress_dlg(progbar,
 							(gfloat) count/progbar_count, "Saving");
 						progbar_nextstep = progbar_nextstep + progbar_quantum;
 					}
 					count++;
 
-					if (user_data->reversed.statinfo.pt == AST_FORMAT_ULAW){
+					if (user_data->reversed.statinfo.pt == AST_FORMAT_ULAW) {
 						sample = ulaw2linear(*r_pd);
 						phtons(pd, sample);
 					}
-					else if(user_data->reversed.statinfo.pt == AST_FORMAT_ALAW){
+					else if (user_data->reversed.statinfo.pt == AST_FORMAT_ALAW) {
 						sample = alaw2linear(*r_pd);
 						phtons(pd, sample);
 					}
@@ -2508,22 +2537,22 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 				 * we have to write some silence information for one channel */
 				if (user_data->forward.statinfo.start_time > user_data->reversed.statinfo.start_time) {
 					f_write_silence = (guint32)
-						((user_data->forward.statinfo.start_time-user_data->reversed.statinfo.start_time)*8000);
+						((user_data->forward.statinfo.start_time - user_data->reversed.statinfo.start_time)*8000);
 				}
 				else if (user_data->forward.statinfo.start_time < user_data->reversed.statinfo.start_time) {
 					r_write_silence = (guint32)
-						((user_data->reversed.statinfo.start_time-user_data->forward.statinfo.start_time)*8000);
+						((user_data->reversed.statinfo.start_time - user_data->forward.statinfo.start_time)*8000);
 				}
 				for(;;) {
-					if(stop_flag)
+					if (stop_flag)
 						break;
-					if((count > progbar_nextstep) && (count <= progbar_count)) {
+					if ((count > progbar_nextstep) && (count <= progbar_count)) {
 						update_progress_dlg(progbar,
 							(gfloat) count/progbar_count, "Saving");
 						progbar_nextstep = progbar_nextstep + progbar_quantum;
 					}
 					count++;
-					if(f_write_silence > 0) {
+					if (f_write_silence > 0) {
 						rread = read(rev_fd, r_pd, 1);
 						switch (user_data->forward.statinfo.reg_pt) {
 						case AST_FORMAT_ULAW:
@@ -2536,7 +2565,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 						fread_cnt = 1;
 						f_write_silence--;
 					}
-					else if(r_write_silence > 0) {
+					else if (r_write_silence > 0) {
 						fread_cnt = read(forw_fd, f_pd, 1);
 						switch (user_data->reversed.statinfo.reg_pt) {
 						case AST_FORMAT_ULAW:
@@ -2555,11 +2584,13 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 					}
 					if ((rread == 0) && (fread_cnt == 0))
 						break;
-					if ((user_data->forward.statinfo.pt == AST_FORMAT_ULAW) && (user_data->reversed.statinfo.pt == AST_FORMAT_ULAW)){
+					if ((user_data->forward.statinfo.pt == AST_FORMAT_ULAW)
+					    && (user_data->reversed.statinfo.pt == AST_FORMAT_ULAW)) {
 						sample = (ulaw2linear(*r_pd) + ulaw2linear(*f_pd)) / 2;
 						phtons(pd, sample);
 					}
-					else if((user_data->forward.statinfo.pt == AST_FORMAT_ALAW) && (user_data->reversed.statinfo.pt == AST_FORMAT_ALAW)){
+					else if ((user_data->forward.statinfo.pt == AST_FORMAT_ALAW)
+						&& (user_data->reversed.statinfo.pt == AST_FORMAT_ALAW)) {
 						sample = (alaw2linear(*r_pd) + alaw2linear(*f_pd)) / 2;
 						phtons(pd, sample);
 					}
@@ -2591,14 +2622,14 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		switch (channels) {
 			/* only forward direction */
 			case SAVE_FORWARD_DIRECTION_MASK: {
-				progbar_count = user_data->forward.saveinfo.count;
+				progbar_count   = user_data->forward.saveinfo.count;
 				progbar_quantum = user_data->forward.saveinfo.count/100;
 				fd = forw_fd;
 				break;
 			}
 			/* only reversed direction */
 			case SAVE_REVERSE_DIRECTION_MASK: {
-				progbar_count = user_data->reversed.saveinfo.count;
+				progbar_count   = user_data->reversed.saveinfo.count;
 				progbar_quantum = user_data->reversed.saveinfo.count/100;
 				fd = rev_fd;
 				break;
@@ -2616,9 +2647,9 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 
 		/* XXX how do you just copy the file? */
 		while ((rread = read(fd, pd, 1)) > 0) {
-			if(stop_flag)
+			if (stop_flag)
 				break;
-			if((count > progbar_nextstep) && (count <= progbar_count)) {
+			if ((count > progbar_nextstep) && (count <= progbar_count)) {
 				update_progress_dlg(progbar,
 					(gfloat) count/progbar_count, "Saving");
 				progbar_nextstep = progbar_nextstep + progbar_quantum;
@@ -2690,7 +2721,9 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
 	*/
 
 	/* we can not save in both directions */
-	if ((user_data->forward.saveinfo.saved == FALSE) && (user_data->reversed.saveinfo.saved == FALSE) && (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both)))) {
+	if ((user_data->forward.saveinfo.saved == FALSE)
+	    && (user_data->reversed.saveinfo.saved == FALSE)
+	    && (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both)))) {
 		/* there are many combinations here, we just exit when first matches */
 		if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC) ||
 			(user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC))
@@ -2777,20 +2810,24 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
 	if (format == SAVE_AU_FORMAT)
 	{
 		/* make sure streams are alaw/ulaw */
-		if ((channels & SAVE_FORWARD_DIRECTION_MASK) && (user_data->forward.statinfo.pt != AST_FORMAT_ALAW) && (user_data->forward.statinfo.pt != AST_FORMAT_ULAW)){
+		if ((channels & SAVE_FORWARD_DIRECTION_MASK)
+		    && (user_data->forward.statinfo.pt != AST_FORMAT_ALAW)
+		    && (user_data->forward.statinfo.pt != AST_FORMAT_ULAW)) {
 			simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 				"Can't save in a file: saving in au format supported only for alaw/ulaw streams");
 			g_free(g_dest);
 			return TRUE; /* we're done */
 		}
-		if ((channels & SAVE_REVERSE_DIRECTION_MASK) && (user_data->reversed.statinfo.pt != AST_FORMAT_ALAW) && (user_data->reversed.statinfo.pt != AST_FORMAT_ULAW)){
+		if ((channels & SAVE_REVERSE_DIRECTION_MASK)
+		    && (user_data->reversed.statinfo.pt != AST_FORMAT_ALAW)
+		    && (user_data->reversed.statinfo.pt != AST_FORMAT_ULAW)) {
 			simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 				"Can't save in a file: saving in au format supported only for alaw/ulaw streams");
 			g_free(g_dest);
 			return TRUE; /* we're done */
 		}
 		/* make sure pt's don't differ */
-		if ((channels == SAVE_BOTH_DIRECTION_MASK) && (user_data->forward.statinfo.pt != user_data->reversed.statinfo.pt)){
+		if ((channels == SAVE_BOTH_DIRECTION_MASK) && (user_data->forward.statinfo.pt != user_data->reversed.statinfo.pt)) {
 			simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 				"Can't save in a file: Forward and reverse direction differ in type");
 			g_free(g_dest);
@@ -2800,7 +2837,7 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
 	else if (format == SAVE_RAW_FORMAT)
 	{
 		/* can't save raw in both directions */
-		if (channels == SAVE_BOTH_DIRECTION_MASK){
+		if (channels == SAVE_BOTH_DIRECTION_MASK) {
 			simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 				"Can't save in a file: Unable to save raw data in both directions");
 			g_free(g_dest);
@@ -2815,7 +2852,7 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
 		return TRUE; /* we're done */
 	}
 
-	if(!copy_file(g_dest, channels, format, user_data)) {
+	if (!copy_file(g_dest, channels, format, user_data)) {
 		/* XXX - report the error type! */
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 			"An error occurred while saving voice in a file!");
@@ -3066,7 +3103,7 @@ add_to_list(GtkWidget *list, user_data_t * user_data, guint32 number,
 			     BACKGROUND_COLOR_COL, (char *)color_str,
 			     -1);
 
-	if(flags & STAT_FLAG_FIRST){
+	if (flags & STAT_FLAG_FIRST) {
 		/* Set first row as active */
 		gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)), &user_data->dlg.iter);
 	}
@@ -3431,14 +3468,14 @@ create_iax2_dialog(user_data_t* user_data)
 	window_present(window);
 
 	/* some widget references need to be saved for outside use */
-	user_data->dlg.window = window;
-	user_data->dlg.list_fwd = list_fwd;
-	user_data->dlg.list_rev = list_rev;
+	user_data->dlg.window	       = window;
+	user_data->dlg.list_fwd	       = list_fwd;
+	user_data->dlg.list_rev	       = list_rev;
 	user_data->dlg.label_stats_fwd = label_stats_fwd;
 	user_data->dlg.label_stats_rev = label_stats_rev;
-	user_data->dlg.notebook = notebook;
-	user_data->dlg.selected_list = list_fwd;
-	user_data->dlg.number_of_nok = 0;
+	user_data->dlg.notebook	       = notebook;
+	user_data->dlg.selected_list   = list_fwd;
+	user_data->dlg.number_of_nok   = 0;
 
 	/*
 	 * select the initial row
@@ -3452,26 +3489,27 @@ static gboolean
 process_node(proto_node *ptree_node, header_field_info *hfinformation,
 							const gchar* proto_field, guint32* p_result)
 {
-	field_info            *finfo;
-	proto_node            *proto_sibling_node;
-	header_field_info     *hfssrc;
-	ipv4_addr             *ipv4;
+	field_info        *finfo;
+	proto_node        *proto_sibling_node;
+	header_field_info *hfssrc;
+	ipv4_addr         *ipv4;
 
 	finfo = PNODE_FINFO(ptree_node);
 
-	if (hfinformation==(finfo->hfinfo)) {
+	if (hfinformation == (finfo->hfinfo)) {
 		hfssrc = proto_registrar_get_byname(proto_field);
 		if (hfssrc == NULL) {
 			simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 				      "Bad field name!");
 			return FALSE;
 			}
-		for(ptree_node=ptree_node->first_child; ptree_node!=NULL;
-					ptree_node=ptree_node->next) {
-			finfo=PNODE_FINFO(ptree_node);
-			if (hfssrc==finfo->hfinfo) {
-				if (hfinformation->type==FT_IPv4) {
-					ipv4 = fvalue_get(&finfo->value);
+		for (ptree_node = ptree_node->first_child;
+		     ptree_node != NULL;
+		     ptree_node = ptree_node->next) {
+			finfo = PNODE_FINFO(ptree_node);
+			if (hfssrc == finfo->hfinfo) {
+				if (hfinformation->type == FT_IPv4) {
+					ipv4      = fvalue_get(&finfo->value);
 					*p_result = ipv4_get_net_order_addr(ipv4);
 				}
 				else {
@@ -3480,7 +3518,7 @@ process_node(proto_node *ptree_node, header_field_info *hfinformation,
 				return TRUE;
 			}
 		}
-		if(!ptree_node)
+		if (!ptree_node)
 			return FALSE;
 	}
 
@@ -3586,44 +3624,44 @@ iax2_analysis(
 	}
 	user_data->r_tempname = g_strdup(tempname);
 	ws_close(fd);
-	user_data->forward.saveinfo.fp = NULL;
-	user_data->reversed.saveinfo.fp = NULL;
-	user_data->dlg.save_voice_as_w = NULL;
-	user_data->dlg.save_csv_as_w = NULL;
+	user_data->forward.saveinfo.fp	   = NULL;
+	user_data->reversed.saveinfo.fp	   = NULL;
+	user_data->dlg.save_voice_as_w	   = NULL;
+	user_data->dlg.save_csv_as_w	   = NULL;
 	user_data->dlg.dialog_graph.window = NULL;
 
 	/* init dialog_graph */
-	user_data->dlg.dialog_graph.needs_redraw=TRUE;
-	user_data->dlg.dialog_graph.interval=tick_interval_values[DEFAULT_TICK_VALUE_INDEX];
-	user_data->dlg.dialog_graph.draw_area=NULL;
+	user_data->dlg.dialog_graph.needs_redraw	 = TRUE;
+	user_data->dlg.dialog_graph.interval		 = tick_interval_values[DEFAULT_TICK_VALUE_INDEX];
+	user_data->dlg.dialog_graph.draw_area		 = NULL;
 #if GTK_CHECK_VERSION(2,22,0)
-	user_data->dlg.dialog_graph.surface=NULL;
+	user_data->dlg.dialog_graph.surface		 = NULL;
 #else
-	user_data->dlg.dialog_graph.pixmap=NULL;
+	user_data->dlg.dialog_graph.pixmap		 = NULL;
 #endif
-	user_data->dlg.dialog_graph.scrollbar=NULL;
-	user_data->dlg.dialog_graph.scrollbar_adjustment=NULL;
-	user_data->dlg.dialog_graph.surface_width=500;
-	user_data->dlg.dialog_graph.surface_height=200;
-	user_data->dlg.dialog_graph.pixels_per_tick=pixels_per_tick[DEFAULT_PIXELS_PER_TICK_INDEX];
-	user_data->dlg.dialog_graph.max_y_units=AUTO_MAX_YSCALE;
-	user_data->dlg.dialog_graph.last_interval=0xffffffff;
-	user_data->dlg.dialog_graph.max_interval=0;
-	user_data->dlg.dialog_graph.num_items=0;
-	user_data->dlg.dialog_graph.start_time = -1;
-
-	for(i=0;i<MAX_GRAPHS;i++){
-		user_data->dlg.dialog_graph.graph[i].color.pixel=0;
-		user_data->dlg.dialog_graph.graph[i].color.red=col[i].red;
-		user_data->dlg.dialog_graph.graph[i].color.green=col[i].green;
-		user_data->dlg.dialog_graph.graph[i].color.blue=col[i].blue;
-		user_data->dlg.dialog_graph.graph[i].rgba_color.red=rgba_col[i].red;
-		user_data->dlg.dialog_graph.graph[i].rgba_color.green=rgba_col[i].green;
-		user_data->dlg.dialog_graph.graph[i].rgba_color.blue=rgba_col[i].blue;
-		user_data->dlg.dialog_graph.graph[i].rgba_color.alpha=rgba_col[i].alpha;
-		user_data->dlg.dialog_graph.graph[i].display=TRUE;
-		user_data->dlg.dialog_graph.graph[i].display_button=NULL;
-		user_data->dlg.dialog_graph.graph[i].ud=user_data;
+	user_data->dlg.dialog_graph.scrollbar		 = NULL;
+	user_data->dlg.dialog_graph.scrollbar_adjustment = NULL;
+	user_data->dlg.dialog_graph.surface_width	 = 500;
+	user_data->dlg.dialog_graph.surface_height	 = 200;
+	user_data->dlg.dialog_graph.pixels_per_tick	 = pixels_per_tick[DEFAULT_PIXELS_PER_TICK_INDEX];
+	user_data->dlg.dialog_graph.max_y_units		 = AUTO_MAX_YSCALE;
+	user_data->dlg.dialog_graph.last_interval	 = 0xffffffff;
+	user_data->dlg.dialog_graph.max_interval	 = 0;
+	user_data->dlg.dialog_graph.num_items		 = 0;
+	user_data->dlg.dialog_graph.start_time		 = -1;
+
+	for(i = 0; i < MAX_GRAPHS; i++) {
+		user_data->dlg.dialog_graph.graph[i].color.pixel      = 0;
+		user_data->dlg.dialog_graph.graph[i].color.red	      = col[i].red;
+		user_data->dlg.dialog_graph.graph[i].color.green      = col[i].green;
+		user_data->dlg.dialog_graph.graph[i].color.blue	      = col[i].blue;
+		user_data->dlg.dialog_graph.graph[i].rgba_color.red   = rgba_col[i].red;
+		user_data->dlg.dialog_graph.graph[i].rgba_color.green = rgba_col[i].green;
+		user_data->dlg.dialog_graph.graph[i].rgba_color.blue  = rgba_col[i].blue;
+		user_data->dlg.dialog_graph.graph[i].rgba_color.alpha = rgba_col[i].alpha;
+		user_data->dlg.dialog_graph.graph[i].display	      = TRUE;
+		user_data->dlg.dialog_graph.graph[i].display_button   = NULL;
+		user_data->dlg.dialog_graph.graph[i].ud		      =	user_data;
 	}
 
 	/* create the dialog box */
@@ -3647,16 +3685,16 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 	guint16 port_dst_rev;
 	/* unsigned int ptype; */
 
-	gchar filter_text[256];
-	dfilter_t *sfcode;
+	gchar	      filter_text[256];
+	dfilter_t    *sfcode;
 	capture_file *cf;
-	epan_dissect_t edt;
-	gboolean frame_matched;
-	frame_data *fdata;
-	GList *strinfo_list;
-	GList *filtered_list = NULL;
+	gboolean      frame_matched;
+	frame_data   *fdata;
+	GList	     *strinfo_list;
+	GList	     *filtered_list = NULL;
+	guint	      nfound;
+	epan_dissect_t	   edt;
 	rtp_stream_info_t *strinfo;
-	guint nfound;
 
 	/* Try to compile the filter. */
 	g_strlcpy(filter_text,"iax2 && (ip || ipv6)",256);
@@ -3687,12 +3725,14 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 		    "You didn't choose a IAX2 packet!");
 		return;
 	}
-	/* check if it is Voice or MiniPacket
+#if 0
+	/* check if it is Voice or MiniPacket */
 	if (!get_int_value_from_proto_tree(edt->tree, "iax2", "iax2.call", &ptype)) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 		    "Please select a Voice packet!");
 		return;
-	} */
+	}
+#endif
 
 	/* check if it is part of a Call */
 	if (edt.pi.circuit_id == 0) {
@@ -3722,17 +3762,17 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 	{
 		strinfo = (rtp_stream_info_t*)(strinfo_list->data);
 		if (ADDRESSES_EQUAL(&(strinfo->src_addr),&(ip_src_fwd))
-			&& strinfo->src_port==port_src_fwd
+			&& strinfo->src_port == port_src_fwd
 			&& ADDRESSES_EQUAL(&(strinfo->dest_addr),&(ip_dst_fwd))
-			&& strinfo->dest_port==port_dst_fwd)
+			&& strinfo->dest_port == port_dst_fwd)
 		{
 			filtered_list = g_list_prepend(filtered_list, strinfo);
 		}
 
 		if (ADDRESSES_EQUAL(&(strinfo->src_addr),&(ip_src_rev))
-			&& strinfo->src_port==port_src_rev
+			&& strinfo->src_port == port_src_rev
 			&& ADDRESSES_EQUAL(&(strinfo->dest_addr),&(ip_dst_rev))
-			&& strinfo->dest_port==port_dst_rev)
+			&& strinfo->dest_port == port_dst_rev)
 		{
 			++nfound;
 			filtered_list = g_list_append(filtered_list, strinfo);