Use a consistent bracketing style throughout. Add modelines.

svn path=/trunk/; revision=48728

1 files changed, 49 insertions, 82 deletions

diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index fd80e67acd..85bfad3803 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -134,25 +134,21 @@ create_encap_list_store(void)
     encap_list_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_UINT);
 
     /* Scan all Wiretap encapsulation types */
-    for (encap = 1; encap < wtap_get_num_encap_types(); encap++)
-    {
+    for (encap = 1; encap < wtap_get_num_encap_types(); encap++) {
         /* Check if we can write to a PCAP file
          *
          * Exclude wtap encapsulations that require a pseudo header,
          * because we won't setup one from the text we import and
          * wiretap doesn't allow us to write 'raw' frames
          */
-        if ((wtap_wtap_encap_to_pcap_encap(encap) > 0) && !wtap_encap_requires_phdr(encap))
-        {
+        if ((wtap_wtap_encap_to_pcap_encap(encap) > 0) && !wtap_encap_requires_phdr(encap)) {
             /* If it has got a name */
-            if ((name = wtap_encap_string(encap)))
-            {
+            if ((name = wtap_encap_string(encap))) {
                 gtk_list_store_append(encap_list_store, &iter);
                 gtk_list_store_set(encap_list_store, &iter, 0, name, 1, encap, -1);
             }
         }
     }
-
 }
 
 static GtkWidget *
@@ -180,8 +176,7 @@ encap_co_changed(GtkComboBox *widget, gpointer data)
 
     result = gtk_combo_box_get_active_iter(widget, &iter);
 
-    if (result)
-    {
+    if (result) {
         guint encap;
         GtkTreeModel *model = gtk_combo_box_get_model(widget);
         gtk_tree_model_get(model, &iter, 1, &encap, -1);
@@ -190,8 +185,7 @@ encap_co_changed(GtkComboBox *widget, gpointer data)
             result = FALSE;
     }
 
-    if (result)
-    {
+    if (result) {
         header_cb = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_CB_KEY));
         g_signal_emit_by_name(G_OBJECT(header_cb), "toggled", data);
     } else {
@@ -235,8 +229,7 @@ header_eth_rb_toggle(GtkWidget *widget, gpointer data)
     GtkWidget *ppi_lbl      = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_LBL_KEY));
     GtkWidget *ppi_te       = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_TE_KEY));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-    {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
         gtk_widget_set_sensitive(etype_lbl,    TRUE);
         gtk_widget_set_sensitive(etype_te,     TRUE);
         gtk_widget_set_sensitive(prot_lbl,     FALSE);
@@ -249,9 +242,7 @@ header_eth_rb_toggle(GtkWidget *widget, gpointer data)
         gtk_widget_set_sensitive(tag_te,       FALSE);
         gtk_widget_set_sensitive(ppi_lbl,      FALSE);
         gtk_widget_set_sensitive(ppi_te,       FALSE);
-    }
-    else
-    {
+    } else {
         gtk_widget_set_sensitive(etype_lbl,    FALSE);
         gtk_widget_set_sensitive(etype_te,     FALSE);
     }
@@ -273,8 +264,7 @@ header_ipv4_rb_toggle(GtkWidget *widget, gpointer data)
     GtkWidget *ppi_lbl      = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_LBL_KEY));
     GtkWidget *ppi_te       = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_TE_KEY));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-    {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
         gtk_widget_set_sensitive(etype_lbl,    FALSE);
         gtk_widget_set_sensitive(etype_te,     FALSE);
         gtk_widget_set_sensitive(prot_lbl,     TRUE);
@@ -287,9 +277,7 @@ header_ipv4_rb_toggle(GtkWidget *widget, gpointer data)
         gtk_widget_set_sensitive(tag_te,       FALSE);
         gtk_widget_set_sensitive(ppi_lbl,      FALSE);
         gtk_widget_set_sensitive(ppi_te,       FALSE);
-    }
-    else
-    {
+    } else {
         gtk_widget_set_sensitive(prot_lbl,     FALSE);
         gtk_widget_set_sensitive(prot_te,      FALSE);
     }
@@ -311,8 +299,7 @@ header_udp_rb_toggle(GtkWidget *widget, gpointer data)
     GtkWidget *ppi_lbl      = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_LBL_KEY));
     GtkWidget *ppi_te       = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_TE_KEY));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-    {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
         gtk_widget_set_sensitive(etype_lbl,    FALSE);
         gtk_widget_set_sensitive(etype_te,     FALSE);
         gtk_widget_set_sensitive(prot_lbl,     FALSE);
@@ -325,9 +312,7 @@ header_udp_rb_toggle(GtkWidget *widget, gpointer data)
         gtk_widget_set_sensitive(tag_te,       FALSE);
         gtk_widget_set_sensitive(ppi_lbl,      FALSE);
         gtk_widget_set_sensitive(ppi_te,       FALSE);
-    }
-    else
-    {
+    } else {
         gtk_widget_set_sensitive(src_port_lbl, FALSE);
         gtk_widget_set_sensitive(src_port_te,  FALSE);
         gtk_widget_set_sensitive(dst_port_lbl, FALSE);
@@ -351,8 +336,7 @@ header_tcp_rb_toggle(GtkWidget *widget, gpointer data)
     GtkWidget *ppi_lbl      = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_LBL_KEY));
     GtkWidget *ppi_te       = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_TE_KEY));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-    {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
         gtk_widget_set_sensitive(etype_lbl,    FALSE);
         gtk_widget_set_sensitive(etype_te,     FALSE);
         gtk_widget_set_sensitive(prot_lbl,     FALSE);
@@ -365,9 +349,7 @@ header_tcp_rb_toggle(GtkWidget *widget, gpointer data)
         gtk_widget_set_sensitive(tag_te,       FALSE);
         gtk_widget_set_sensitive(ppi_lbl,      FALSE);
         gtk_widget_set_sensitive(ppi_te,       FALSE);
-    }
-    else
-    {
+    } else {
         gtk_widget_set_sensitive(src_port_lbl, FALSE);
         gtk_widget_set_sensitive(src_port_te,  FALSE);
         gtk_widget_set_sensitive(dst_port_lbl, FALSE);
@@ -391,8 +373,7 @@ header_sctp_rb_toggle(GtkWidget *widget, gpointer data)
     GtkWidget *ppi_lbl      = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_LBL_KEY));
     GtkWidget *ppi_te       = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_TE_KEY));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-    {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
         gtk_widget_set_sensitive(etype_lbl,    FALSE);
         gtk_widget_set_sensitive(etype_te,     FALSE);
         gtk_widget_set_sensitive(prot_lbl,     FALSE);
@@ -405,9 +386,7 @@ header_sctp_rb_toggle(GtkWidget *widget, gpointer data)
         gtk_widget_set_sensitive(tag_te,       TRUE);
         gtk_widget_set_sensitive(ppi_lbl,      FALSE);
         gtk_widget_set_sensitive(ppi_te,       FALSE);
-    }
-    else
-    {
+    } else {
         gtk_widget_set_sensitive(src_port_lbl, FALSE);
         gtk_widget_set_sensitive(src_port_te,  FALSE);
         gtk_widget_set_sensitive(dst_port_lbl, FALSE);
@@ -433,8 +412,7 @@ header_sctp_data_rb_toggle(GtkWidget *widget, gpointer data)
     GtkWidget *ppi_lbl      = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_LBL_KEY));
     GtkWidget *ppi_te       = GTK_WIDGET(g_object_get_data(G_OBJECT(data), IMPORT_HEADER_PPI_TE_KEY));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-    {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
         gtk_widget_set_sensitive(etype_lbl,    FALSE);
         gtk_widget_set_sensitive(etype_te,     FALSE);
         gtk_widget_set_sensitive(prot_lbl,     FALSE);
@@ -447,9 +425,7 @@ header_sctp_data_rb_toggle(GtkWidget *widget, gpointer data)
         gtk_widget_set_sensitive(tag_te,       FALSE);
         gtk_widget_set_sensitive(ppi_lbl,      TRUE);
         gtk_widget_set_sensitive(ppi_te,       TRUE);
-    }
-    else
-    {
+    } else {
         gtk_widget_set_sensitive(src_port_lbl, FALSE);
         gtk_widget_set_sensitive(src_port_te,  FALSE);
         gtk_widget_set_sensitive(dst_port_lbl, FALSE);
@@ -526,9 +502,6 @@ file_import_open(text_import_info_t *info)
 
     g_array_append_val(idb_inf->interface_data, int_data);
 
-
-
-
     info->wdh = wtap_dump_fdopen_ng(import_file_fd, WTAP_FILE_PCAPNG, info->encapsulation, info->max_frame_length, FALSE, shb_hdr, idb_inf, &err);
     if (info->wdh == NULL) {
         open_failure_alert_box(capfile_name, err, TRUE);
@@ -544,18 +517,15 @@ file_import_open(text_import_info_t *info)
 
     text_import_cleanup();
 
-    if (fclose(info->import_text_file))
-    {
+    if (fclose(info->import_text_file)) {
         read_failure_alert_box(info->import_text_filename, errno);
     }
 
-    if (!wtap_dump_close(info->wdh, &err))
-    {
+    if (!wtap_dump_close(info->wdh, &err)) {
         write_failure_alert_box(capfile_name, err);
     }
 
-    if (cf_open(&cfile, capfile_name, TRUE /* temporary file */, &err) != CF_OK)
-    {
+    if (cf_open(&cfile, capfile_name, TRUE /* temporary file */, &err) != CF_OK) {
         open_failure_alert_box(capfile_name, err, FALSE);
         goto end;
     }
@@ -652,15 +622,13 @@ setup_file_import(GtkWidget *main_w)
 
         GtkTreeIter iter;
 
-        if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(encap_co), &iter))
-        {
+        if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(encap_co), &iter)) {
             GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(encap_co));
             gtk_tree_model_get(model, &iter, 1, &text_import_info->encapsulation, -1);
         }
 
         if ((text_import_info->encapsulation == WTAP_ENCAP_ETHERNET) &&
-            (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(header_cb))))
-        {
+            (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(header_cb)))) {
             text_import_info->dummy_header_type =
                 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(header_eth_rb))       ? HEADER_ETH :
                 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(header_ipv4_rb))      ? HEADER_IPV4 :
@@ -670,12 +638,10 @@ setup_file_import(GtkWidget *main_w)
                 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(header_sctp_data_rb)) ? HEADER_SCTP_DATA :
                 HEADER_NONE;
 
-            switch (text_import_info->dummy_header_type)
-            {
+            switch (text_import_info->dummy_header_type) {
             case HEADER_ETH:
                 text_import_info->pid = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(etype_te)), NULL, 16);
-                if (text_import_info->pid > 0xffff)
-                {
+                if (text_import_info->pid > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The Ethertype (%x) is too large.",
                         text_import_info->pid);
                     g_free(text_import_info->import_text_filename);
@@ -688,8 +654,7 @@ setup_file_import(GtkWidget *main_w)
 
             case HEADER_IPV4:
                 text_import_info->protocol = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(protocol_te)), NULL, 10);
-                if (text_import_info->protocol > 0xff)
-                {
+                if (text_import_info->protocol > 0xff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The IPv4 protocol (%u) is too large.",
                         text_import_info->protocol);
                     g_free(text_import_info->import_text_filename);
@@ -703,8 +668,7 @@ setup_file_import(GtkWidget *main_w)
             case HEADER_UDP:
             case HEADER_TCP:
                 text_import_info->src_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
-                if (text_import_info->src_port > 0xffff)
-                {
+                if (text_import_info->src_port > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The source port (%u) is too large.",
                         text_import_info->src_port);
                     g_free(text_import_info->import_text_filename);
@@ -714,8 +678,7 @@ setup_file_import(GtkWidget *main_w)
                     return NULL;
                 }
                 text_import_info->dst_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
-                if (text_import_info->dst_port > 0xffff)
-                {
+                if (text_import_info->dst_port > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The destination port (%u) is too large.",
                         text_import_info->dst_port);
                     g_free(text_import_info->import_text_filename);
@@ -728,8 +691,7 @@ setup_file_import(GtkWidget *main_w)
 
             case HEADER_SCTP:
                 text_import_info->src_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
-                if (text_import_info->src_port > 0xffff)
-                {
+                if (text_import_info->src_port > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The source port (%u) is too large.",
                         text_import_info->src_port);
                     g_free(text_import_info->import_text_filename);
@@ -739,8 +701,7 @@ setup_file_import(GtkWidget *main_w)
                     return NULL;
                 }
                 text_import_info->dst_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
-                if (text_import_info->dst_port > 0xffff)
-                {
+                if (text_import_info->dst_port > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The destination port (%u) is too large.",
                         text_import_info->dst_port);
                     g_free(text_import_info->import_text_filename);
@@ -754,8 +715,7 @@ setup_file_import(GtkWidget *main_w)
 
             case HEADER_SCTP_DATA:
                 text_import_info->src_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
-                if (text_import_info->src_port > 0xffff)
-                {
+                if (text_import_info->src_port > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The source port (%u) is too large.",
                         text_import_info->src_port);
                     g_free(text_import_info->import_text_filename);
@@ -765,8 +725,7 @@ setup_file_import(GtkWidget *main_w)
                     return NULL;
                 }
                 text_import_info->dst_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
-                if (text_import_info->dst_port > 0xffff)
-                {
+                if (text_import_info->dst_port > 0xffff) {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The destination port (%u) is too large.",
                         text_import_info->dst_port);
                     g_free(text_import_info->import_text_filename);
@@ -788,9 +747,7 @@ setup_file_import(GtkWidget *main_w)
         text_import_info->max_frame_length = (guint)strtol(gtk_entry_get_text(GTK_ENTRY(framelen_te)), NULL, 10);
         if (text_import_info->max_frame_length == 0) {
             text_import_info->max_frame_length = IMPORT_MAX_PACKET;
-        }
-        else if (text_import_info->max_frame_length > IMPORT_MAX_PACKET)
-        {
+        } else if (text_import_info->max_frame_length > IMPORT_MAX_PACKET) {
             simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The maximum frame length (%u) is too long.",
                 text_import_info->max_frame_length);
             g_free(text_import_info->import_text_filename);
@@ -816,8 +773,9 @@ file_import_ok_cb(GtkWidget *widget _U_, gpointer data)
     if (do_file_close(&cfile, FALSE, " before opening a new capture file")) {
         /* open the new file */
         text_import_info = setup_file_import((GtkWidget *)data);
-        if (text_import_info)
+        if (text_import_info) {
             file_import_open(text_import_info);
+        }
     }
 }
 
@@ -1181,21 +1139,30 @@ void
 file_import_cmd_cb(GtkWidget *widget _U_)
 {
     /* Do we have an encapsulation type list? */
-    if (!encap_list_store)
-    {
+    if (!encap_list_store) {
         /* No. Create one. */
         create_encap_list_store();
     }
 
     /* Has a file import dialog already been opened? */
-    if (file_import_dlg_w)
-    {
+    if (file_import_dlg_w) {
         /* Yes. Just re-activate that dialog box. */
         reactivate_window(file_import_dlg_w);
     } else {
         /* No. Create one */
         file_import_dlg_w = file_import_dlg_new();
     }
-
-    return;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=4 expandtab:
+ * :indentSize=4:tabSize=4:noTabs=true:
+ */