From ed85e20e4d6a27d5405f37366dd34b64c10a9211 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 23 Apr 2014 00:20:40 -0700 Subject: u_intN_t is dead, long live uintN_t. And, as we require at least autoconf 2.61, and as autoconf 2.61 and later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to define the uintN_t and intN_t macros if the system doesn't define them for us. This lets us get rid of bitypes.h as well. --- checksum.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'checksum.c') diff --git a/checksum.c b/checksum.c index e451bdd4..d8263c7a 100644 --- a/checksum.c +++ b/checksum.c @@ -51,7 +51,7 @@ for i in range(len(crc_table)/8): sys.stdout.write("\n") */ -static const u_int16_t crc10_table[256] = +static const uint16_t crc10_table[256] = { 0x0000, 0x0233, 0x0255, 0x0066, 0x0299, 0x00aa, 0x00cc, 0x02ff, 0x0301, 0x0132, 0x0154, 0x0367, 0x0198, 0x03ab, 0x03cd, 0x01fe, @@ -92,8 +92,8 @@ init_crc10_table(void) { #define CRC10_POLYNOMIAL 0x633 register int i, j; - register u_int16_t accum; - u_int16_t verify_crc10_table[256]; + register uint16_t accum; + uint16_t verify_crc10_table[256]; for ( i = 0; i < 256; i++ ) { @@ -110,8 +110,8 @@ init_crc10_table(void) #undef CRC10_POLYNOMIAL } -u_int16_t -verify_crc10_cksum(u_int16_t accum, const u_char *p, int length) +uint16_t +verify_crc10_cksum(uint16_t accum, const u_char *p, int length) { register int i; @@ -136,16 +136,16 @@ init_checksum(void) { * Creates the OSI Fletcher checksum. See 8473-1, Appendix C, section C.3. * The checksum field of the passed PDU does not need to be reset to zero. */ -u_int16_t -create_osi_cksum (const u_int8_t *pptr, int checksum_offset, int length) +uint16_t +create_osi_cksum (const uint8_t *pptr, int checksum_offset, int length) { int x; int y; - u_int32_t mul; - u_int32_t c0; - u_int32_t c1; - u_int16_t checksum; + uint32_t mul; + uint32_t c0; + uint32_t c1; + uint16_t checksum; int index; c0 = 0; -- cgit v1.2.1