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

Use "-G fields" rather than "-G" in Makefiles. 

Print an error and exit if an invalid option is given for the "-G" flag.

svn path=/trunk/; revision=5466
This commit is contained in:
Guy Harris 2002-05-14 18:27:28 +00:00
parent ae185d3e9c
commit 976a82b06a
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/Makefile.am
View File

@ -1,12 +1,11 @@
# Makefile.am
# Automake file for Ethereal documentation
#
# $Id: Makefile.am,v 1.13 2002/02/05 18:39:06 gram Exp $
# $Id: Makefile.am,v 1.14 2002/05/14 18:27:27 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
# By Gerald Combs <gerald@ethereal.com>
# Copyright 1998 Gerald Combs
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@ -32,7 +31,7 @@
> ../ethereal.1
ethereal.pod: ethereal.pod.template ../ethereal
../ethereal -G | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/ethereal.pod.template > ethereal.pod
../ethereal -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/ethereal.pod.template > ethereal.pod
../tethereal.1: tethereal.pod ../config.h
$(POD2MAN) tethereal.pod \
@ -41,7 +40,7 @@ ethereal.pod: ethereal.pod.template ../ethereal
> ../tethereal.1
tethereal.pod: tethereal.pod.template ../tethereal
../tethereal -G | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/tethereal.pod.template > tethereal.pod
../tethereal -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/tethereal.pod.template > tethereal.pod
../editcap.1: editcap.pod ../config.h
$(POD2MAN) $(srcdir)/editcap.pod \

7
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.248 2002/05/14 10:15:12 guy Exp $
* $Id: main.c,v 1.249 2002/05/14 18:27:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1295,6 +1295,11 @@ main(int argc, char *argv[])
proto_registrar_dump_fields();
else if (strcmp(argv[2], "protocols") == 0)
proto_registrar_dump_protocols();
else {
fprintf(stderr, "tethereal: Invalid \"%s\" option for -G flag\n",
argv[2]);
exit(1);
}
}
exit(0);
}

7
tethereal.c
View File

@ -1,6 +1,6 @@
/* tethereal.c
*
* $Id: tethereal.c,v 1.136 2002/05/14 10:15:09 guy Exp $
* $Id: tethereal.c,v 1.137 2002/05/14 18:27:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -345,6 +345,11 @@ main(int argc, char *argv[])
proto_registrar_dump_fields();
else if (strcmp(argv[2], "protocols") == 0)
proto_registrar_dump_protocols();
else {
fprintf(stderr, "tethereal: Invalid \"%s\" option for -G flag\n",
argv[2]);
exit(1);
}
}
exit(0);
}