diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-08-30 14:17:40 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-08-30 14:17:40 +0000 |
commit | 71f903b956ff151f553b791bb43a52959a8be983 (patch) | |
tree | f39d52e05bd3785b6e26c6bda1d4d89f4f4e48cb /wsutil/crc6.c | |
parent | ebb63d8a7f18802d4fd7aec469fddcd3afed1de0 (diff) | |
download | wireshark-71f903b956ff151f553b791bb43a52959a8be983.tar.gz |
Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
Diffstat (limited to 'wsutil/crc6.c')
-rw-r--r-- | wsutil/crc6.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/wsutil/crc6.c b/wsutil/crc6.c deleted file mode 100644 index 333a1a51cd..0000000000 --- a/wsutil/crc6.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * crc6.c - * - * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <glib.h> -#include "crc6.h" - - -guint16 update_crc6_by_bytes(guint16 crc6, guint8 byte1, guint8 byte2) { - int bit; - guint32 remainder = ( byte1<<8 | byte2 ) << 6; - guint32 polynomial = 0x6F << 15; - - for (bit = 15; - bit >= 0; - --bit) - { - if (remainder & (0x40 << bit)) - { - remainder ^= polynomial; - } - polynomial >>= 1; - } - - return (guint16)(remainder ^ crc6); -} - - |