Remove -z/--analysis option.

It was only used for one special case that is not commonly used by
anyone.
This commit is contained in:
Johanna Amann 2016-08-04 17:42:50 -07:00
parent 30b40b214a
commit b7ab6a5332
5 changed files with 1 additions and 114 deletions

View file

@ -25,7 +25,6 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "bsd-getopt-long.h"
#include "input.h"
#include "ScriptAnaly.h"
#include "DNS_Mgr.h"
#include "Frame.h"
#include "Scope.h"
@ -116,7 +115,6 @@ ProfileLogger* profiling_logger = 0;
ProfileLogger* segment_logger = 0;
SampleLogger* sample_logger = 0;
int signal_val = 0;
int do_notice_analysis = 0;
extern char version[];
char* command_line_policy = 0;
vector<string> params;
@ -182,7 +180,6 @@ void usage()
fprintf(stderr, " -v|--version | print version and exit\n");
fprintf(stderr, " -w|--writefile <writefile> | write to given tcpdump file\n");
fprintf(stderr, " -x|--print-state <file.bst> | print contents of state file\n");
fprintf(stderr, " -z|--analyze <analysis> | run the specified policy file analysis\n");
#ifdef DEBUG
fprintf(stderr, " -B|--debug <dbgstreams> | Enable debugging output for selected streams ('-B help' for help)\n");
#endif
@ -484,7 +481,6 @@ int main(int argc, char** argv)
{"writefile", required_argument, 0, 'w'},
{"version", no_argument, 0, 'v'},
{"print-state", required_argument, 0, 'x'},
{"analyze", required_argument, 0, 'z'},
{"no-checksums", no_argument, 0, 'C'},
{"force-dns", no_argument, 0, 'F'},
{"load-seeds", required_argument, 0, 'G'},
@ -542,7 +538,7 @@ int main(int argc, char** argv)
opterr = 0;
char opts[256];
safe_strncpy(opts, "B:e:f:G:H:I:i:n:p:R:r:s:T:t:U:w:x:X:z:CFNPQSWabdghv",
safe_strncpy(opts, "B:e:f:G:H:I:i:n:p:R:r:s:T:t:U:w:x:X:CFNPQSWabdghv",
sizeof(opts));
#ifdef USE_PERFTOOLS_DEBUG
@ -615,16 +611,6 @@ int main(int argc, char** argv)
bst_file = optarg;
break;
case 'z':
if ( streq(optarg, "notice") )
do_notice_analysis = 1;
else
{
fprintf(stderr, "Unknown analysis type: %s\n", optarg);
exit(1);
}
break;
case 'B':
debug_streams = optarg;
break;
@ -1103,9 +1089,6 @@ int main(int argc, char** argv)
delete alive_handlers;
if ( do_notice_analysis )
notice_analysis();
if ( stmts )
{
stmt_flow_type flow;