diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
-rw-r--r-- | epan/Makefile.common | 2 | ||||
-rw-r--r-- | epan/bitswap.c | 68 | ||||
-rw-r--r-- | epan/bitswap.h | 42 | ||||
-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 |
7 files changed, 3 insertions, 116 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/bitswap.c b/epan/bitswap.c deleted file mode 100644 index bccbecf401..0000000000 --- a/epan/bitswap.c +++ /dev/null @@ -1,68 +0,0 @@ -/* bitswap.c - * Table of bit-swapped values of bytes - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include <glib.h> - -#include "bitswap.h" - -/* "swaptab[i]" is the value of "i" with the bits reversed. */ -const guint8 -swaptab[256] = -{ - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, - 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, - 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, - 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, - 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, - 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, - 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, - 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, - 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, - 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, - 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, - 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, - 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, - 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, - 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, - 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, - 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, - 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, - 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, - 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, - 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, - 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, - 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, - 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, - 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, - 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, - 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, - 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, - 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, - 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, - 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, - 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff, -}; diff --git a/epan/bitswap.h b/epan/bitswap.h deleted file mode 100644 index bbf374b01e..0000000000 --- a/epan/bitswap.h +++ /dev/null @@ -1,42 +0,0 @@ -/* bitswap.h - * Macro to bitswap a byte by looking it up in a table - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __BITSWAP_H__ -#define __BITSWAP_H__ - -#include "ws_symbol_export.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -WS_DLL_PUBLIC const guint8 swaptab[256]; - -#define BIT_SWAP(b) (swaptab[b]) - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* bitswap.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> |