aboutsummaryrefslogtreecommitdiffstats
path: root/caputils
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-06-10 18:26:40 -0700
committerGuy Harris <guy@alum.mit.edu>2018-06-11 01:28:17 +0000
commitdd87f2018a45de643d05bc426e9353a1d67bb037 (patch)
tree997961c3d5a483c80c4b033ed702914b9f4f3388 /caputils
parent5ecbcaf483a552a8b78d525b9f32c5cfa575d59c (diff)
Fix names in declarations to match definitions.
Change-Id: I7b3dd147b523fd3251d93dd1917d2e2c47433207 Reviewed-on: https://code.wireshark.org/review/28195 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'caputils')
-rw-r--r--caputils/capture-pcap-util-int.h9
-rw-r--r--caputils/capture-pcap-util.h3
2 files changed, 7 insertions, 5 deletions
diff --git a/caputils/capture-pcap-util-int.h b/caputils/capture-pcap-util-int.h
index 1ed8a7ffa5..bde4432a99 100644
--- a/caputils/capture-pcap-util-int.h
+++ b/caputils/capture-pcap-util-int.h
@@ -36,19 +36,20 @@ extern void request_high_resolution_timestamp(pcap_t *pcap_h);
extern if_capabilities_t *get_if_capabilities_local(interface_options *interface_opts,
cap_device_open_err *err, char **err_str);
extern pcap_t *open_capture_device_local(capture_options *capture_opts,
- interface_options *interface_opts, int timeout, cap_device_open_err *err,
- char (*open_err_str)[PCAP_ERRBUF_SIZE]);
+ interface_options *interface_opts, int timeout,
+ cap_device_open_err *open_err, char (*open_err_str)[PCAP_ERRBUF_SIZE]);
#ifdef HAVE_PCAP_CREATE
extern if_capabilities_t *get_if_capabilities_pcap_create(interface_options *interface_opts,
cap_device_open_err *err, char **err_str);
extern pcap_t *open_capture_device_pcap_create(capture_options *capture_opts,
- interface_options *interface_opts, int timeout, cap_device_open_err *err,
+ interface_options *interface_opts, int timeout,
+ cap_device_open_err *open_err,
char (*open_err_str)[PCAP_ERRBUF_SIZE]);
#endif /* HAVE_PCAP_CREATE */
extern if_capabilities_t *get_if_capabilities_pcap_open_live(interface_options *interface_opts,
cap_device_open_err *err, char **err_str);
extern pcap_t *open_capture_device_pcap_open_live(interface_options *interface_opts,
- int timeout, cap_device_open_err *err,
+ int timeout, cap_device_open_err *open_err,
char (*open_err_str)[PCAP_ERRBUF_SIZE]);
/*
diff --git a/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h
index b8eb855b0e..e0e3fa78e9 100644
--- a/caputils/capture-pcap-util.h
+++ b/caputils/capture-pcap-util.h
@@ -66,7 +66,8 @@ typedef enum {
extern if_capabilities_t *get_if_capabilities(interface_options *interface_opts,
cap_device_open_err *err, char **err_str);
extern pcap_t *open_capture_device(capture_options *capture_opts,
- interface_options *interface_opts, int timeout, cap_device_open_err *err,
+ interface_options *interface_opts,
+ int timeout, cap_device_open_err *open_err,
char (*open_err_str)[PCAP_ERRBUF_SIZE]);
#endif /* HAVE_LIBPCAP */