osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Define OPTSTRING_CAPTURE_COMMON as nothing if we don't have pcap. 

No capturing, no capture options.

Change-Id: I0023184b9c358d5876f19a098590f34d641c8649
Reviewed-on: https://code.wireshark.org/review/2493
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-06-20 14:14:02 -07:00
parent 26bbee3fad
commit 9a50b0f20b
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tshark.c
View File

@ -975,7 +975,7 @@ main(int argc, char *argv[])
gchar *output_only = NULL;
#ifndef HAVE_LIBPCAP
#define OPTSTRING_B ""
#define OPTSTRING_CAPTURE_COMMON ""
#endif /* HAVE_LIBPCAP */
/* the leading - ensures that getopt() does not permute the argv[] entries

16
ui/qt/main.cpp
View File

@ -499,22 +499,10 @@ int main(int argc, char *argv[])
// XXX Should the remaining code be in WiresharkApplcation::WiresharkApplication?
#ifdef HAVE_LIBPCAP
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
#define OPTSTRING_B "B:"
#else
#define OPTSTRING_B ""
#endif /* _WIN32 or HAVE_PCAP_CREATE */
#else /* HAVE_LIBPCAP */
#define OPTSTRING_B ""
#ifndef HAVE_LIBPCAP
#define OPTSTRING_CAPTURE_COMMON ""
#endif /* HAVE_LIBPCAP */
#ifdef HAVE_PCAP_CREATE
#define OPTSTRING_I "I"
#else
#define OPTSTRING_I ""
#endif
#define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:g:Hh" "jJ:kK:lm:nN:o:P:Qr:R:St:u:vw:X:z:"
static const struct option long_options[] = {
{(char *)"help", no_argument, NULL, 'h'},