osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

"read_filters()" is actually called late enough in the startup process 

that it can pop up a message box; have it do so.

Make the "Can't open file" message boxes in "colors.c" include the
"errno" error message in the message they put up.

Don't complain about being unable to open the color filter file if it
doesn't exist (perhaps the user just never made one).

Make the message for a failure to open the preferences file resemble
that for a failure to open a color filter file.

svn path=/trunk/; revision=575
This commit is contained in:
Guy Harris 1999-08-25 03:22:46 +00:00
parent a5fd847154
commit 0259c6ec29
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
colors.c
View File

@ -1,7 +1,7 @@
/* colors.c
* Definitions for color structures and routines
*
* $Id: colors.c,v 1.3 1999/08/24 23:00:56 gram Exp $
* $Id: colors.c,v 1.4 1999/08/25 03:22:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -33,6 +33,9 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include "ethereal.h"
#include "packet.h"
#include "colors.h"
@ -116,16 +119,15 @@ colors_init(capture_file *cf)
color_filter(cf,i)->c_colorfilter = dfilter_new();
if(dfilter_compile((color_filter(cf,i)->c_colorfilter),
default_colors[i].proto) != 0}{
simple_dialog(ESD_TYPE_WARN, NULL, "Cannot compile default filter %s.\n%s",
simple_dialog(ESD_TYPE_WARN, NULL,
"Cannot compile default filter %s.\n%s",
default_colors[i].proto, dfilter_error_msg);
/* should reject this filter */
}
cf->colors->num_of_filters++;
}
#endif
if(!read_filters(cf))
/* again, no window because it is not up, yet */
fprintf(stderr,"Cound not open filter file\n");
read_filters(cf);
fprintf(stderr,"Colors initialized\n");
fflush(stderr);
@ -217,6 +219,11 @@ read_filters(capture_file *cf)
sprintf(path, "%s/%s", getenv("HOME"), fname);
if ((f = fopen(path, "r")) == NULL) {
if (errno != ENOENT) {
simple_dialog(ESD_TYPE_WARN, NULL,
"Could not open filter file\n\"%s\": %s.", path,
strerror(errno));
}
g_free(path);
return FALSE;
}
@ -296,8 +303,9 @@ write_filters(capture_file *cf)
sprintf(path, "%s/%s", getenv("HOME"), name);
if ((f = fopen(path, "w+")) == NULL) {
simple_dialog(ESD_TYPE_WARN, NULL, "Could not open\n%s\nfor writing.",
path);
simple_dialog(ESD_TYPE_WARN, NULL,
"Could not open\n%s\nfor writing: %s.",
path, strerror(errno));
g_free(path);
return FALSE;
}
@ -469,7 +477,8 @@ color_save_cb (GtkButton *button,
capture_file *cf;
cf = (capture_file *)user_data;
if(!write_filters(cf))
simple_dialog(ESD_TYPE_WARN, NULL, "Could not open filter file!");
simple_dialog(ESD_TYPE_WARN, NULL, "Could not open filter file: %s",
strerror(errno));
}

4
ethereal.c
View File

@ -1,6 +1,6 @@
/* ethereal.c
*
* $Id: ethereal.c,v 1.105 1999/08/24 17:26:10 gram Exp $
* $Id: ethereal.c,v 1.106 1999/08/25 03:22:46 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -1475,7 +1475,7 @@ main(int argc, char *argv[])
come up on top of the main window. */
if (pf_path != NULL) {
simple_dialog(ESD_TYPE_WARN, NULL,
"Can't open preferences file\n\"%s\": %s.", pf_path,
"Could not open preferences file\n\"%s\": %s.", pf_path,
strerror(pf_open_errno));
}