diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-16 09:16:57 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-16 09:16:57 +0000 |
| commit | 3b9f6dfab4f4efe1d97450d1d69d1b37f822ad5f (patch) | |
| tree | 8e5b80fcfb0adba8be49e4ba7ca51eb624864166 | |
| parent | 4f78d3c69b4c7356956381c5fe1e7b874ca04654 (diff) | |
| download | wireshark-3b9f6dfab4f4efe1d97450d1d69d1b37f822ad5f.tar.gz | |
Move bitswap.[ch] from epan to wsutil.
svn path=/trunk/; revision=53365
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bmc.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-fddi.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-h223.c | 2 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wsutil/Makefile.common | 2 | ||||
| -rw-r--r-- | wsutil/bitswap.c (renamed from epan/bitswap.c) | 0 | ||||
| -rw-r--r-- | wsutil/bitswap.h (renamed from epan/bitswap.h) | 0 |
9 files changed, 6 insertions, 6 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index b9451d6142..f287bd58d7 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1461,7 +1461,6 @@ set(LIBWIRESHARK_FILES asn1.c atalk-utils.c base64.c - bitswap.c camel-persistentdata.c charsets.c circuit.c diff --git a/epan/Makefile.common b/epan/Makefile.common index 793d0eb736..a18a468fb0 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -32,7 +32,6 @@ LIBWIRESHARK_SRC = \ asn1.c \ atalk-utils.c \ base64.c \ - bitswap.c \ camel-persistentdata.c \ charsets.c \ circuit.c \ @@ -158,7 +157,6 @@ LIBWIRESHARK_INCLUDES = \ atalk-utils.h \ ax25_pids.h \ base64.h \ - bitswap.h \ bridged_pids.h \ camel-persistentdata.h \ charsets.h \ diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index 31c58f8a51..b70e2381ae 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -28,7 +28,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/bitswap.h> +#include <wsutil/bitswap.h> #include <epan/asn1.h> /* needed for packet-gsm_map.h */ #include "packet-cell_broadcast.h" diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index b73d6477b6..c6347941cb 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -33,7 +33,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/bitswap.h> +#include <wsutil/bitswap.h> #include <epan/prefs.h> #include "packet-fddi.h" #include "packet-llc.h" diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 0b1a60bc1d..078ee5fd48 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -27,7 +27,7 @@ #include <glib.h> #include <epan/wmem/wmem.h> -#include <epan/bitswap.h> +#include <wsutil/bitswap.h> #include <epan/circuit.h> #include <epan/conversation.h> #include <epan/packet.h> diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index c107aca54f..a2cc259fa5 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -39,6 +39,7 @@ set(WSUTIL_FILES adler32.c aes.c airpdcap_wep.c + bitswap.c crash_info.c crc10.c crc16.c diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 2dd37efe05..4bf9cfa25f 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -32,6 +32,7 @@ LIBWSUTIL_SRC = \ adler32.c \ aes.c \ airpdcap_wep.c \ + bitswap.c \ crash_info.c \ crc6.c \ crc7.c \ @@ -65,6 +66,7 @@ LIBWSUTIL_INCLUDES = \ aes.h \ bits_ctz.h \ bits_count_ones.h \ + bitswap.h \ crash_info.h \ crc6.h \ crc7.h \ diff --git a/epan/bitswap.c b/wsutil/bitswap.c index bccbecf401..bccbecf401 100644 --- a/epan/bitswap.c +++ b/wsutil/bitswap.c diff --git a/epan/bitswap.h b/wsutil/bitswap.h index bbf374b01e..bbf374b01e 100644 --- a/epan/bitswap.h +++ b/wsutil/bitswap.h |