diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-01-31 03:22:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-01-31 03:22:42 +0000 |
| commit | 1980fa5dbf6e3aa953d8bd09d69e0700b74a56ad (patch) | |
| tree | 1dda390f197eb0fd4dc3bf2e9b4e5b36a8162189 /gtk/dfilter_expr_dlg.c | |
| parent | 61e26a56bada54f651cb5c4110cae4b8f6548863 (diff) | |
Pass ESD_BTN_OK rather than NULL as a second argument to
"simple_dialog()"; NULL might be #defined to be a pointer expression on
some platforms, causing compiler warnings (and, on platforms where a
null pointer doesn't have all its bits 0, possibly causing misbehavior,
although I don't think there are any such platforms on which Ethereal
runs).
Don't allow 0 as button mask argument to "simple_dialog()".
Squelch a compiler warning.
Report fatal problems as errors, not warnings.
Report file I/O errors with "file_open_error_message()".
Report file write errors (including those reported by "close()", e.g.
some errors writing to an NFS server) when saving raw packet data to a
file.
svn path=/trunk/; revision=9915
Diffstat (limited to 'gtk/dfilter_expr_dlg.c')
| -rw-r--r-- | gtk/dfilter_expr_dlg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index 8c2472615f..c4d935e92e 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c,v 1.48 2004/01/31 02:25:44 ulfl Exp $ + * $Id: dfilter_expr_dlg.c,v 1.49 2004/01/31 03:22:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -778,7 +778,7 @@ dfilter_report_bad_value(char *format, ...) vsnprintf(error_msg_buf, sizeof error_msg_buf, format, args); va_end(args); - simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, ESD_BTN_OK, "%s", error_msg_buf); } @@ -900,11 +900,11 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) can_compare = TRUE; /* not a comparison */ if (!can_compare) { if (range_str == NULL) { - simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, ESD_BTN_OK, "That field cannot be tested with \"%s\".", item_str); } else { - simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, ESD_BTN_OK, "Ranges of that field cannot be tested with \"%s\".", item_str); } @@ -924,7 +924,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) * This field takes a value, but they didn't supply * one. */ - simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, ESD_BTN_OK, "That field must be compared with a value, " "but you didn't specify a value with which to " "compare it."); |