Get rid of C++/C99-style comments - not all C compilers accept them.

Fix some indentation.

svn path=/trunk/; revision=12710

8 files changed, 25 insertions, 25 deletions

diff --git a/gtk/h323_conversations.c b/gtk/h323_conversations.c
index 70e39014b0..ec60f3eb15 100644
--- a/gtk/h323_conversations.c
+++ b/gtk/h323_conversations.c
@@ -353,8 +353,8 @@ int h245conversations_packet(h323conversations_tapinfo_t *tapinfo _U_, packet_in
 		a = (h323_conversations_info_t*)(list->data);
 		g_memmove(&src, pinfo->src.data, 4);
 		g_memmove(&dst, pinfo->dst.data, 4);
-		//src = *(pinfo->src.data);
-		//dst = *(pinfo->dst.data);
+		/* src = *(pinfo->src.data); */
+		/* dst = *(pinfo->dst.data); */
 		srcp = pinfo->srcport;
 		dstp = pinfo->destport;
 		p_transport = pinfo->ipproto;
diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 778b758ce0..4f19f7946d 100644
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <string.h>  //for memmove
+#include <string.h>  /* for memmove */
 #include "globals.h"
 #include "simple_dialog.h"
 #include <epan/epan_dissect.h>
diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index ac698320e3..d7b1523196 100644
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -276,13 +276,13 @@ guint32 diff, i, size=0, start, end;
 		diff=g_array_index(array, struct tsn_sort, i).secs*1000000+g_array_index(array, struct tsn_sort, i).usecs-u_data->io->min_x;
 		start=g_array_index(array, struct tsn_sort, i).offset;
 		end = start + g_array_index(array, struct tsn_sort, i).length;
-		//printf("i=%u, start=%u, end=%u\n",i, start, end);
+		/* printf("i=%u, start=%u, end=%u\n",i, start, end); */
 		if (start>=min_tsn)
-		gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
-			(guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff),
-			(guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-((SUB_32(start,min_tsn))*u_data->io->y_interval)),
-			(guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff),
-			(guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-((SUB_32(end,min_tsn))*u_data->io->y_interval)));
+			gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
+				(guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff),
+				(guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-((SUB_32(start,min_tsn))*u_data->io->y_interval)),
+				(guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff),
+				(guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-((SUB_32(end,min_tsn))*u_data->io->y_interval)));
 
 	}
 
@@ -315,7 +315,7 @@ gfloat dis;
 	{
 		if (u_data->io->tmp==FALSE)
 		{
-			if (u_data->assoc->sort_tsn1!=NULL)// || u_data->assoc->sack1!=NULL)
+			if (u_data->assoc->sort_tsn1!=NULL)/* || u_data->assoc->sack1!=NULL) */
 				u_data->io->max_y=u_data->io->tmp_max_tsn1 - u_data->io->tmp_min_tsn1;
 			else
 				u_data->io->max_y= 0;
@@ -331,7 +331,7 @@ gfloat dis;
 	{
 		if (u_data->io->tmp==FALSE)
 		{
-			if (u_data->assoc->tsn2!=NULL)// || u_data->assoc->sack2!=NULL)
+			if (u_data->assoc->tsn2!=NULL)/* || u_data->assoc->sack2!=NULL) */
 					u_data->io->max_y=u_data->io->tmp_max_tsn2 -u_data->io->tmp_min_tsn2;
 			else
 				u_data->io->max_y= 0;
@@ -348,7 +348,7 @@ gfloat dis;
 		u_data->io->draw_area->allocation.height);
 
 	distance=5;
-	//x_axis
+	/* x_axis */
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc, LEFT_BORDER+u_data->io->offset,u_data->io->pixmap_height-BOTTOM_BORDER,u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset, u_data->io->pixmap_height-BOTTOM_BORDER);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset, u_data->io->pixmap_height-BOTTOM_BORDER, u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset-5, u_data->io->pixmap_height-BOTTOM_BORDER-5);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset, u_data->io->pixmap_height-BOTTOM_BORDER, u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset-5, u_data->io->pixmap_height-BOTTOM_BORDER+5);
@@ -525,7 +525,7 @@ gfloat dis;
 
 	distance=5;
 
-	//y-axis
+	/* y-axis */
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc, LEFT_BORDER,TOP_BORDER-u_data->io->offset,LEFT_BORDER,u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,LEFT_BORDER,TOP_BORDER-u_data->io->offset, LEFT_BORDER-5, TOP_BORDER-u_data->io->offset+5);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,LEFT_BORDER,TOP_BORDER-u_data->io->offset, LEFT_BORDER+5, TOP_BORDER-u_data->io->offset+5);
@@ -962,7 +962,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 	gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_press_event",(GtkSignalFunc)on_button_press, u_data);
 	gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_release_event",(GtkSignalFunc)on_button_release, u_data);
 	gtk_widget_set_events(u_data->io->draw_area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK);
-	//dlg_set_cancel(u_data->io->window, bt_close);
+	/* dlg_set_cancel(u_data->io->window, bt_close); */
 	
 
     gtk_widget_show(u_data->io->window);
diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c
index 19fc55322a..53f6fc8a07 100644
--- a/gtk/sctp_error_dlg.c
+++ b/gtk/sctp_error_dlg.c
@@ -45,7 +45,7 @@ static GtkWidget *sctp_error_dlg=NULL;
 static GtkWidget *clist = NULL;
 static GList *last_list = NULL;
 static sctp_error_info_t* selected_packet = NULL;/* current selection */
-//static sctp_assoc_info_t* selected_assoc = NULL;
+/*static sctp_assoc_info_t* selected_assoc = NULL; */
 extern GtkWidget *main_display_filter_widget;
 
 
@@ -261,7 +261,7 @@ GList *list;
 
 printf("dlg_show\n");
 
-	//selected_assoc=(sctp_assoc_info_t*)get_selected_assoc();
+	/* selected_assoc=(sctp_assoc_info_t*)get_selected_assoc(); */
 	list =assoc->error_info_list;
 	if (sctp_error_dlg != NULL) {
 		/* There's already a dialog box; reactivate it. */
diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 8747fc20fc..70c0486af3 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -370,7 +370,7 @@ gfloat dis;
                            u_data->io->draw_area->allocation.height);
 
 	distance=5;
-	//x_axis
+	/* x_axis */
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc, LEFT_BORDER+u_data->io->offset,u_data->io->pixmap_height-BOTTOM_BORDER,u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset, u_data->io->pixmap_height-BOTTOM_BORDER);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset, u_data->io->pixmap_height-BOTTOM_BORDER, u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset-5, u_data->io->pixmap_height-BOTTOM_BORDER-5);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset, u_data->io->pixmap_height-BOTTOM_BORDER, u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset-5, u_data->io->pixmap_height-BOTTOM_BORDER+5);
@@ -548,7 +548,7 @@ gfloat dis;
 
 	distance=5;
 
-	//y-axis
+	/* y-axis */
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc, LEFT_BORDER,TOP_BORDER-u_data->io->offset,LEFT_BORDER,u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,LEFT_BORDER,TOP_BORDER-u_data->io->offset, LEFT_BORDER-5, TOP_BORDER-u_data->io->offset+5);
 	gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,LEFT_BORDER,TOP_BORDER-u_data->io->offset, LEFT_BORDER+5, TOP_BORDER-u_data->io->offset+5);
@@ -989,7 +989,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 	gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_press_event",(GtkSignalFunc)on_button_press, u_data);
 	gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_release_event",(GtkSignalFunc)on_button_release, u_data);
 	gtk_widget_set_events(u_data->io->draw_area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK);
-	//dlg_set_cancel(u_data->io->window, bt_close);
+	/* dlg_set_cancel(u_data->io->window, bt_close); */
 	
     gtk_widget_show(u_data->io->window);
 }
diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c
index 52dfbed234..c116c6cece 100644
--- a/gtk/sctp_stat.c
+++ b/gtk/sctp_stat.c
@@ -335,8 +335,8 @@ gint sctp_assoc_vtag_cmp(gconstpointer aa, gconstpointer bb)
 gint sctp_assoc_address_cmp(gconstpointer aa, gconstpointer bb)
 {
 GList *srclist, *dstlist;
-const struct _sctp_tmp_info* a = aa; //tmp_info
-const struct _sctp_assoc_info* b = bb; //info
+const struct _sctp_tmp_info* a = aa; /* tmp_info */
+const struct _sctp_assoc_info* b = bb; /* info */
 struct sockaddr_storage *store=NULL;
 struct sockaddr_storage *srcstore=NULL;
 struct sockaddr_storage *dststore=NULL;
diff --git a/gtk/sctp_stat.h b/gtk/sctp_stat.h
index 8b18668318..5462fbb375 100644
--- a/gtk/sctp_stat.h
+++ b/gtk/sctp_stat.h
@@ -107,7 +107,7 @@ struct tsn_sort{
 
 
 typedef struct _sctp_assoc_info {
-	//guint16	assoc_id;
+	/* guint16	assoc_id; */
 	struct sockaddr_storage	src;
 	struct sockaddr_storage	dst;
 	guint16 port1;
@@ -187,7 +187,7 @@ GList*	children;
 } sctp_allassocs_info_t;
 
 
-//Data structures for sctp_assoc_analyse
+/* Data structures for sctp_assoc_analyse */
 
 struct notes {
 	GtkWidget *checktype;
@@ -224,7 +224,7 @@ struct sctp_analyse {
 	guint16 num_children;
 };
 
-//Data Structures for sctp_graph_dlg
+/* Data Structures for sctp_graph_dlg */
 
 typedef struct _sctp_graph_t {
 	gboolean needs_redraw;
diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c
index d43781dfe7..7cedb5ca6c 100644
--- a/gtk/sctp_stat_dlg.c
+++ b/gtk/sctp_stat_dlg.c
@@ -571,7 +571,7 @@ void sctp_stat_start(GtkWidget *w _U_, gpointer data _U_)
 	sctp_stat_scan();
 
 	/* Show the dialog box with the list of streams */
-	//sctp_stat_dlg_show(sctp_stat_get_info()->assoc_info_list);
+	/* sctp_stat_dlg_show(sctp_stat_get_info()->assoc_info_list); */
 	sctp_stat_dlg_show();
 }