File: 0005-Call-pcap_lib_version-rather-than-access-pcap_versio.patch

package info (click to toggle)
tcptraceroute 1.5beta7%2Bdebian-4.2
  • links: PTS, VCS
  • area: main
  • in suites: sid, trixie
  • size: 760 kB
  • sloc: ansic: 2,819; sh: 2,794; perl: 160; makefile: 19
file content (42 lines) | stat: -rw-r--r-- 1,096 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
From: Michael Toren <mct@toren.net>
Date: Fri, 5 May 2017 11:43:40 -0700
Subject: Call `pcap_lib_version()` rather than access `pcap_version` directly

Closes #5

Thanks!

Applied-Upstream: https://github.com/mct/tcptraceroute/commit/3772409867b3c5591c50d69f0abacf780c3a555f
---
 capture.h | 2 --
 main.c    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/capture.h b/capture.h
index 43e02e7..8e62be4 100644
--- a/capture.h
+++ b/capture.h
@@ -20,8 +20,6 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-extern char pcap_version[];
-
 extern pcap_t *pcap;
 extern int pcap_fd;
 
diff --git a/main.c b/main.c
index 6ede131..ff22bc0 100644
--- a/main.c
+++ b/main.c
@@ -408,8 +408,8 @@ int main(int argc, char **argv)
 			case 'd':
 				o_debug++;
 				debug("%s %s\n", PACKAGE, VERSION);
-				debug("Compiled with libpcap %s, libnet %s (API %d)\n",
-					pcap_version, LIBNET_VERSION, LIBNET_API_VERSION);
+				debug("Compiled with %s; libnet %s (API %d)\n",
+					pcap_lib_version(), LIBNET_VERSION, LIBNET_API_VERSION);
 				break;
 
 			case 'n':