From: Chris Maynard Date: Wed, 23 Jan 2013 21:16:42 +0000 (-0000) Subject: Usage formatting changes: X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=619c6e20a0b0726a2885144f74a0ed6cbd994e93 Usage formatting changes: -> Wrap all text at column 80 -> Reference http://www.tcpdump.org/linktypes.html instead of net/bpf.h -> Other misc. wording changes. svn path=/trunk/; revision=47234 --- diff --git a/text2pcap.c b/text2pcap.c index 7463a3ddc8..29af045fa4 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -931,7 +931,7 @@ parse_preamble (void) packet_preamble_len -= i; memmove(packet_preamble, packet_preamble+i, packet_preamble_len); } - + /* * If no "-t" flag was specified, don't attempt to parse the packet @@ -1301,22 +1301,22 @@ usage (void) " number is assumed to be fractions of a second.\n" " NOTE: Date/time fields from the current date/time are\n" " used as the default for unspecified fields.\n" - " -D the text before the packet starts either with an I or O\n" + " -D the text before the packet starts with an I or an O,\n" " indicating that the packet is inbound or outbound.\n" " This is only stored if the output format is PCAP-NG.\n" " -a enable ASCII text dump identification.\n" - " It allows to identify the start of the ASCII text\n" - " dump and not include it in the packet even if it\n" - " looks like HEX dump.\n" + " The start of the ASCII text dump can be identified\n" + " and excluded from the packet data, even if it looks\n" + " like a HEX dump.\n" " NOTE: Do not enable it if the input file does not\n" " contain the ASCII text dump.\n" "\n" "Output:\n" - " -l link-layer type number; default is 1 (Ethernet).\n" - " See the file net/bpf.h for list of numbers.\n" - " Use this option if your dump is a complete hex dump\n" - " of an encapsulated packet and you wish to specify\n" - " the exact type of encapsulation.\n" + " -l link-layer type number; default is 1 (Ethernet). See\n" + " http://www.tcpdump.org/linktypes.html for a list of\n" + " numbers. Use this option if your dump is a complete\n" + " hex dump of an encapsulated packet and you wish to\n" + " specify the exact type of encapsulation.\n" " Example: -l 7 for ARCNet packets.\n" " -m max packet length in output; default is %d\n" "\n" @@ -1329,20 +1329,20 @@ usage (void) " Automatically prepends Ethernet header as well.\n" " Example: -i 46\n" " -u , prepend dummy UDP header with specified\n" - " dest and source ports (in DECIMAL).\n" + " source and destination ports (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n" " Example: -u 1000,69 to make the packets look like\n" " TFTP/UDP packets.\n" " -T , prepend dummy TCP header with specified\n" - " dest and source ports (in DECIMAL).\n" + " source and destination ports (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n" " Example: -T 50,60\n" " -s ,, prepend dummy SCTP header with specified\n" - " dest/source ports and verification tag (in DECIMAL).\n" + " source/dest ports and verification tag (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n" " Example: -s 30,40,34\n" " -S ,, prepend dummy SCTP header with specified\n" - " dest/source ports and verification tag 0.\n" + " source/dest ports and verification tag 0.\n" " Automatically prepends a dummy SCTP DATA\n" " chunk header with payload protocol identifier ppi.\n" " Example: -S 30,40,34\n" @@ -1350,7 +1350,7 @@ usage (void) "Miscellaneous:\n" " -h display this help and exit.\n" " -d show detailed debug of parser states.\n" - " -q generate no output at all (automatically turns off -d).\n" + " -q generate no output at all (automatically disables -d).\n" " -n use PCAP-NG instead of PCAP as output format.\n" "", VERSION, MAX_PACKET);