diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-12-25 19:53:04 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-12-25 19:53:04 +0000 |
| commit | 6329407d9a968df7e7e9230bde1d1d1257cf25d4 (patch) | |
| tree | 555dfb75ab02ed68436adb06d3ab665eb6401fb9 /text2pcap.c | |
| parent | 05827f38abd88bee25b4cb6ebdbed8de8adc4d6c (diff) | |
Remove current version of -D option, because:
* it is off by default
* not documented
* makes text2pcap to coredump when used
* its goal is not clear (to me).
I'm willing to reimplement it under a different option name
if I understand what it should do. Then I can fix and test it.
svn path=/trunk/; revision=46741
Diffstat (limited to 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/text2pcap.c b/text2pcap.c index 7c329e148c..ba85995581 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -213,7 +213,6 @@ static guint32 ts_usec = 0; static char *ts_fmt = NULL; static struct tm timecode_default; -static char new_date_fmt = 0; static unsigned char* pkt_lnstart; /* Input file */ @@ -1048,14 +1047,6 @@ parse_token (token_t token, char *str) state_str[state], token_str[token], str ? str : ""); } - /* First token must be treated as a timestamp if time strip format is - not empty */ - if (state == INIT || state == START_OF_LINE) { - if (ts_fmt != NULL && new_date_fmt) { - token = T_TEXT; - } - } - switch(state) { /* ----- Waiting for new packet -------------------------------------------*/ @@ -1349,11 +1340,10 @@ parse_options (int argc, char *argv[]) #endif /* _WIN32 */ /* Scan CLI parameters */ - while ((c = getopt(argc, argv, "Ddhqe:i:l:m:no:u:s:S:t:T:a")) != -1) { + while ((c = getopt(argc, argv, "dhqe:i:l:m:no:u:s:S:t:T:a")) != -1) { switch(c) { case '?': usage(); break; case 'h': usage(); break; - case 'D': new_date_fmt = 1; break; case 'd': if (!quiet) debug++; break; case 'q': quiet = TRUE; debug = FALSE; break; case 'l': pcap_link_type = strtol(optarg, NULL, 0); break; |