summaryrefslogtreecommitdiff
path: root/includes/omapip/buffer.h
diff options
context:
space:
mode:
authorWlodek Wencel <wlodek@isc.org>2022-01-25 18:57:28 +0100
committerWlodek Wencel <wlodek@isc.org>2022-01-25 18:57:28 +0100
commite9d37e26897a349f8483092fd0305ea03a97b0e2 (patch)
tree5ccf3e3afaee5c9cbce00d23db33c4af019de32b /includes/omapip/buffer.h
parent8eec892acc041bbdb361d1c1ac36a26b3d3cc2db (diff)
parent3d53b2f2a0369c2af83c738d4e8194077315cbb4 (diff)
downloadisc-dhcp-v4_4.tar.gz
resolved merge conflictsv4_4_3b1v4_4
Diffstat (limited to 'includes/omapip/buffer.h')
-rw-r--r--includes/omapip/buffer.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/includes/omapip/buffer.h b/includes/omapip/buffer.h
index 33eb2f0e..b8d4fa9f 100644
--- a/includes/omapip/buffer.h
+++ b/includes/omapip/buffer.h
@@ -3,7 +3,7 @@
Definitions for the object management API protocol buffering... */
/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
* <info@isc.org>
* https://www.isc.org/
*
@@ -52,7 +52,7 @@ typedef struct _omapi_buffer {
u_int16_t head, tail; /* Buffers are organized in a ring. */
char buf [OMAPI_BUF_SIZE]; /* The actual buffer is included in
the buffer data structure. */
-} omapi_buffer_t;
+} omapi_buffer_t;
#define BUFFER_BYTES_FREE(x) \
((x) -> tail > (x) -> head \
@@ -74,4 +74,3 @@ isc_result_t omapi_connection_get_uint32 (omapi_object_t *, u_int32_t *);
isc_result_t omapi_connection_put_uint32 (omapi_object_t *, u_int32_t);
isc_result_t omapi_connection_get_uint16 (omapi_object_t *, u_int16_t *);
isc_result_t omapi_connection_put_uint16 (omapi_object_t *, u_int32_t);
-