Use normal int types like int32_t instead of isc_int32_t.

OK millert

1 files changed, 25 insertions, 25 deletions

diff --git a/usr.sbin/bind/lib/isc/buffer.c b/usr.sbin/bind/lib/isc/buffer.c
index a28208f128b..bfbac614a60 100644
--- a/usr.sbin/bind/lib/isc/buffer.c
+++ b/usr.sbin/bind/lib/isc/buffer.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.c,v 1.3 2019/12/17 01:46:34 sthen Exp $ */
+/* $Id: buffer.c,v 1.4 2020/01/09 18:17:19 florian Exp $ */
 
 /*! \file */
 
@@ -259,10 +259,10 @@ isc_buffer_compact(isc_buffer_t *b) {
 	b->used = length;
 }
 
-isc_uint8_t
+uint8_t
 isc_buffer_getuint8(isc_buffer_t *b) {
 	unsigned char *cp;
-	isc_uint8_t result;
+	uint8_t result;
 
 	/*
 	 * Read an unsigned 8-bit integer from 'b' and return it.
@@ -273,23 +273,23 @@ isc_buffer_getuint8(isc_buffer_t *b) {
 
 	cp = isc_buffer_current(b);
 	b->current += 1;
-	result = ((isc_uint8_t)(cp[0]));
+	result = ((uint8_t)(cp[0]));
 
 	return (result);
 }
 
 void
-isc__buffer_putuint8(isc_buffer_t *b, isc_uint8_t val) {
+isc__buffer_putuint8(isc_buffer_t *b, uint8_t val) {
 	REQUIRE(ISC_BUFFER_VALID(b));
 	REQUIRE(b->used + 1 <= b->length);
 
 	ISC__BUFFER_PUTUINT8(b, val);
 }
 
-isc_uint16_t
+uint16_t
 isc_buffer_getuint16(isc_buffer_t *b) {
 	unsigned char *cp;
-	isc_uint16_t result;
+	uint16_t result;
 
 	/*
 	 * Read an unsigned 16-bit integer in network byte order from 'b',
@@ -308,7 +308,7 @@ isc_buffer_getuint16(isc_buffer_t *b) {
 }
 
 void
-isc__buffer_putuint16(isc_buffer_t *b, isc_uint16_t val) {
+isc__buffer_putuint16(isc_buffer_t *b, uint16_t val) {
 	REQUIRE(ISC_BUFFER_VALID(b));
 	REQUIRE(b->used + 2 <= b->length);
 
@@ -316,17 +316,17 @@ isc__buffer_putuint16(isc_buffer_t *b, isc_uint16_t val) {
 }
 
 void
-isc__buffer_putuint24(isc_buffer_t *b, isc_uint32_t val) {
+isc__buffer_putuint24(isc_buffer_t *b, uint32_t val) {
 	REQUIRE(ISC_BUFFER_VALID(b));
 	REQUIRE(b->used + 3 <= b->length);
 
 	ISC__BUFFER_PUTUINT24(b, val);
 }
 
-isc_uint32_t
+uint32_t
 isc_buffer_getuint32(isc_buffer_t *b) {
 	unsigned char *cp;
-	isc_uint32_t result;
+	uint32_t result;
 
 	/*
 	 * Read an unsigned 32-bit integer in network byte order from 'b',
@@ -347,17 +347,17 @@ isc_buffer_getuint32(isc_buffer_t *b) {
 }
 
 void
-isc__buffer_putuint32(isc_buffer_t *b, isc_uint32_t val) {
+isc__buffer_putuint32(isc_buffer_t *b, uint32_t val) {
 	REQUIRE(ISC_BUFFER_VALID(b));
 	REQUIRE(b->used + 4 <= b->length);
 
 	ISC__BUFFER_PUTUINT32(b, val);
 }
 
-isc_uint64_t
+uint64_t
 isc_buffer_getuint48(isc_buffer_t *b) {
 	unsigned char *cp;
-	isc_uint64_t result;
+	uint64_t result;
 
 	/*
 	 * Read an unsigned 48-bit integer in network byte order from 'b',
@@ -369,26 +369,26 @@ isc_buffer_getuint48(isc_buffer_t *b) {
 
 	cp = isc_buffer_current(b);
 	b->current += 6;
-	result = ((isc_int64_t)(cp[0])) << 40;
-	result |= ((isc_int64_t)(cp[1])) << 32;
-	result |= ((isc_int64_t)(cp[2])) << 24;
-	result |= ((isc_int64_t)(cp[3])) << 16;
-	result |= ((isc_int64_t)(cp[4])) << 8;
-	result |= ((isc_int64_t)(cp[5]));
+	result = ((int64_t)(cp[0])) << 40;
+	result |= ((int64_t)(cp[1])) << 32;
+	result |= ((int64_t)(cp[2])) << 24;
+	result |= ((int64_t)(cp[3])) << 16;
+	result |= ((int64_t)(cp[4])) << 8;
+	result |= ((int64_t)(cp[5]));
 
 	return (result);
 }
 
 void
-isc__buffer_putuint48(isc_buffer_t *b, isc_uint64_t val) {
-	isc_uint16_t valhi;
-	isc_uint32_t vallo;
+isc__buffer_putuint48(isc_buffer_t *b, uint64_t val) {
+	uint16_t valhi;
+	uint32_t vallo;
 
 	REQUIRE(ISC_BUFFER_VALID(b));
 	REQUIRE(b->used + 6 <= b->length);
 
-	valhi = (isc_uint16_t)(val >> 32);
-	vallo = (isc_uint32_t)(val & 0xFFFFFFFF);
+	valhi = (uint16_t)(val >> 32);
+	vallo = (uint32_t)(val & 0xFFFFFFFF);
 	ISC__BUFFER_PUTUINT16(b, valhi);
 	ISC__BUFFER_PUTUINT32(b, vallo);
 }