diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-03 12:30:57 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-03 21:42:32 +0000 |
commit | fa7cf8737cd913a3217971d7fa8008efb4f0dd87 (patch) | |
tree | acdbc9a0e7f31cff10eb9f2de408ca33ed774c0b | |
parent | 53ba6f401fb76a71adc56a9a70029031c156cda4 (diff) |
Rename ipv6-utils.h to ipv6.h.
By analogy to ipv4.h.
Change-Id: I147565b332024b1bb88e9cd15889255773d04524
Reviewed-on: https://code.wireshark.org/review/13034
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r-- | epan/Makefile.common | 2 | ||||
-rw-r--r-- | epan/addr_and_mask.c | 2 | ||||
-rw-r--r-- | epan/addr_resolv.c | 2 | ||||
-rw-r--r-- | epan/addr_resolv.h | 2 | ||||
-rw-r--r-- | epan/column-utils.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ipv6.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 | ||||
-rw-r--r-- | epan/ftypes/ftype-ipv6.c | 2 | ||||
-rw-r--r-- | epan/ftypes/ftypes.h | 2 | ||||
-rw-r--r-- | epan/geoip_db.h | 2 | ||||
-rw-r--r-- | epan/ipv6.h (renamed from epan/ipv6-utils.h) | 2 | ||||
-rw-r--r-- | epan/to_str.h | 2 | ||||
-rw-r--r-- | epan/tvbuff.h | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index d11786e993..f05552dca4 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -211,7 +211,7 @@ LIBWIRESHARK_INCLUDES = \ ip_opts.h \ ipproto.h \ ipv4.h \ - ipv6-utils.h \ + ipv6.h \ lapd_sapi.h \ llcsaps.h \ next_tvb.h \ diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c index 080e216cdc..fed0637e49 100644 --- a/epan/addr_and_mask.c +++ b/epan/addr_and_mask.c @@ -27,7 +27,7 @@ #include <string.h> #include "tvbuff.h" -#include "ipv6-utils.h" +#include "ipv6.h" #include "addr_and_mask.h" guint32 diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 9a4a275248..63615d1a4b 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -118,7 +118,7 @@ #include "packet.h" #include "addr_and_mask.h" -#include "ipv6-utils.h" +#include "ipv6.h" #include "addr_resolv.h" #include "wsutil/filesystem.h" diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 69ecbb8796..45cd190972 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -34,7 +34,7 @@ #include <epan/address.h> #include <epan/tvbuff.h> -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include <epan/to_str.h> #include <wiretap/wtap.h> #include "ws_symbol_export.h" diff --git a/epan/column-utils.c b/epan/column-utils.c index d754084f25..f7bb4ea36c 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -32,7 +32,7 @@ #include "wsutil/pint.h" #include "addr_resolv.h" #include "address_types.h" -#include "ipv6-utils.h" +#include "ipv6.h" #include "osi-utils.h" #include "value_string.h" #include "column-info.h" diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h index dea9606fb0..b63518a0fb 100644 --- a/epan/dissectors/packet-ipv6.h +++ b/epan/dissectors/packet-ipv6.h @@ -24,7 +24,7 @@ #ifndef __PACKET_IPV6_H_DEFINED__ #define __PACKET_IPV6_H_DEFINED__ -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> /* this definition makes trouble with Microsoft Platform SDK: ws2tcpip.h and is used nowhere */ /*#define INET6_ADDRSTRLEN 46*/ diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index f510a5cdc4..89bfd28213 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -36,7 +36,7 @@ #include <epan/packet.h> #include <epan/strutil.h> #include <epan/addr_resolv.h> -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include <epan/expert.h> #include <epan/asn1.h> #include <wsutil/filesystem.h> diff --git a/epan/ftypes/ftype-ipv6.c b/epan/ftypes/ftype-ipv6.c index e1093c6b67..1e6c5b0baa 100644 --- a/epan/ftypes/ftype-ipv6.c +++ b/epan/ftypes/ftype-ipv6.c @@ -23,7 +23,7 @@ #include <string.h> #include <ftypes-int.h> -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include <epan/addr_resolv.h> static void diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 74dc8e6d2c..60ee74048d 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -190,7 +190,7 @@ ftype_can_matches(enum ftenum ftype); /* ---------------- FVALUE ----------------- */ #include <epan/ipv4.h> -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include <epan/guid-utils.h> #include <epan/tvbuff.h> diff --git a/epan/geoip_db.h b/epan/geoip_db.h index 568a1243aa..5cb1be6e48 100644 --- a/epan/geoip_db.h +++ b/epan/geoip_db.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include <epan/prefs.h> #include "ws_symbol_export.h" diff --git a/epan/ipv6-utils.h b/epan/ipv6.h index 80ab5e3f75..7bf081375e 100644 --- a/epan/ipv6-utils.h +++ b/epan/ipv6.h @@ -1,4 +1,4 @@ -/* ipv6-utils.h +/* ipv6.h * Definitions for IPv6 packet disassembly * * Wireshark - Network traffic analyzer diff --git a/epan/to_str.h b/epan/to_str.h index 801bc9f11c..12e08e963b 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -28,7 +28,7 @@ #include "wsutil/nstime.h" #include "time_fmt.h" #include <epan/packet_info.h> -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include "ws_symbol_export.h" #include "wmem/wmem.h" diff --git a/epan/tvbuff.h b/epan/tvbuff.h index c962389730..c52e3b03f1 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/guid-utils.h> #include <epan/wmem/wmem.h> -#include <epan/ipv6-utils.h> +#include <epan/ipv6.h> #include <wsutil/nstime.h> #include "wsutil/ws_mempbrk.h" |