some more : try to make read/write not break the build if the return value is not...

[obnox/wireshark/wip.git] / gtk / dfilter_expr_dlg.c

diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 32dd1ec28d8941b0d617bb13dc2974f7f175b70d..1eccd111f7d5b62b83c6b41f568b6740dbd627ce 100644 (file)
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -9,8 +9,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2000 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 /* Todo -
@@ -49,7 +49,7 @@
 
 #include "globals.h"
 #include "main.h"
-#include "ui_util.h"
+#include "gui_utils.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "proto_dlg.h"
@@ -77,18 +77,18 @@ typedef struct protocol_data {
 
 static void show_relations(GtkWidget *relation_list, ftenum_t ftype);
 static gboolean relation_is_presence_test(const char *string);
-static void add_relation_list(GtkWidget *relation_list, char *relation, gboolean sensitive);
+static void add_relation_list(GtkWidget *relation_list, const char *relation, gboolean sensitive);
 static void build_boolean_values(GtkWidget *value_list_scrolled_win,
                                  GtkWidget *value_list,
                                  const true_false_string *values);
 static void build_enum_values(GtkWidget *value_list_scrolled_win,
                               GtkWidget *value_list,
                               const value_string *values);
-static void add_value_list_item(GtkWidget *value_list, gchar *string,
-                                gpointer data);
+static void add_value_list_item(GtkWidget *value_list, const gchar *string,
+                                const gpointer data);
 static void display_value_fields(header_field_info *hfinfo,
                                  gboolean is_comparison, GtkWidget *value_label,
-                                 GtkWidget *value_entry, 
+                                 GtkWidget *value_entry,
                                  GtkWidget *value_list_label, GtkWidget *value_list,
                                  GtkWidget *value_list_scrolled_win,
                                  GtkWidget *range_label,
@@ -297,7 +297,7 @@ relation_is_presence_test(const char *string)
 }
 
 static void
-add_relation_list(GtkWidget *relation_list, char *relation, gboolean sensitive)
+add_relation_list(GtkWidget *relation_list, const char *relation, gboolean sensitive)
 {
 #if GTK_MAJOR_VERSION < 2
     GtkWidget *label, *item;
@@ -431,7 +431,7 @@ build_boolean_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list,
      */
     if (values == NULL)
         values = &true_false;
-    add_value_list_item(value_list, values->true_string, (gpointer)values);
+    add_value_list_item(value_list, values->true_string, (const gpointer) values);
     add_value_list_item(value_list, values->false_string, NULL);
 
     /*
@@ -488,7 +488,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
      */
     while (values->strptr != NULL) {
         add_value_list_item(value_list, values->strptr,
-                            (gpointer)values);
+                            (const gpointer) values);
         values++;
     }
 
@@ -503,7 +503,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
 }
 
 static void
-add_value_list_item(GtkWidget *value_list, gchar *string, gpointer data)
+add_value_list_item(GtkWidget *value_list, const gchar *string, const gpointer data)
 {
 #if GTK_MAJOR_VERSION < 2
     GtkWidget *label, *item;
@@ -696,6 +696,7 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
 
             case FT_UINT8:
             case FT_UINT16:
+            case FT_UINT24:
             case FT_UINT32:
                 g_snprintf(value_string, sizeof value_string,
                          "%u", value->value);
@@ -703,6 +704,7 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
 
             case FT_INT8:
             case FT_INT16:
+            case FT_INT24:
             case FT_INT32:
                 g_snprintf(value_string, sizeof value_string,
                          "%d", value->value);
@@ -731,7 +733,7 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
 }
 
 static void
-dfilter_report_bad_value(char *format, ...)
+dfilter_report_bad_value(const char *format, ...)
 {
        char error_msg_buf[1024];
        va_list args;
@@ -787,12 +789,8 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
     gtk_label_get(GTK_LABEL(item_label), &item_str);
 #else
     if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list)),
-                                        &model, &iter))
+                                        &model, &iter)) {
         gtk_tree_model_get(model, &iter, 0, &item_str, -1);
-    else {
-       /* XXX - the relation list is in GTK_SELECTION_BROWSE mode; how
-          can this ever be null? */
-        item_str = NULL;
     }
 #endif
 
@@ -862,11 +860,11 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
     if (!can_compare) {
         if (range_str == NULL) {
             simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                          "That field cannot be tested with \"%s\".",
+                          "That field can't be tested with \"%s\".",
                           item_str);
         } else {
             simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                          "Ranges of that field cannot be tested with \"%s\".",
+                          "Ranges of that field can't be tested with \"%s\".",
                           item_str);
         }
         if (range_str != NULL)
@@ -1078,7 +1076,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 #if GTK_MAJOR_VERSION < 2
     int len;
     void *cookie;
-    gchar *name;
+    const gchar *name;
     GHashTable *proto_array;
     GtkCTreeNode *protocol_node, *item_node;
 #else
@@ -1090,7 +1088,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     GtkTreeSelection  *l_sel;
 #endif
 
-    window = dlg_window_new("Ethereal: Filter Expression");
+    window = dlg_window_new("Wireshark: Filter Expression");
        gtk_window_set_default_size(GTK_WINDOW(window), 500, 400);
     gtk_container_set_border_width(GTK_CONTAINER(window), 5);
 
@@ -1112,7 +1110,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 
     tree_scrolled_win = scrolled_window_new(NULL, NULL);
 #if GTK_MAJOR_VERSION >= 2
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_scrolled_win), 
+    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_scrolled_win),
                                    GTK_SHADOW_IN);
 #endif
     gtk_box_pack_start(GTK_BOX(field_vb), tree_scrolled_win, TRUE, TRUE, 0);
@@ -1164,7 +1162,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(relation_list_scrolled_win),
                                    GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 #if GTK_MAJOR_VERSION >= 2
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(relation_list_scrolled_win), 
+    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(relation_list_scrolled_win),
                                    GTK_SHADOW_IN);
 #endif
 
@@ -1326,7 +1324,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
         name = proto_get_protocol_short_name(protocol); /* name, short_name or filter name ? */
         protocol_node = gtk_ctree_insert_node(GTK_CTREE(field_tree),
                                               NULL, NULL,
-                                              &name, 5,
+                                              (gchar **) &name, 5,
                                               NULL, NULL, NULL, NULL,
                                               FALSE, FALSE);
         gtk_ctree_node_set_row_data(GTK_CTREE(field_tree), protocol_node,
@@ -1396,7 +1394,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 
     GtkTreeIter iter, child_iter;
     void *cookie, *cookie2;
-    gchar *name;
+    const gchar *name;
 
     for (i = proto_get_first_protocol(&cookie); i != -1;
         i = proto_get_next_protocol(&cookie)) {