INN commit: trunk (4 files)

INN Commit rra at isc.org
Sat Aug 30 11:56:12 UTC 2014


    Date: Saturday, August 30, 2014 @ 04:56:11
  Author: iulius
Revision: 9661

Sync with latest rra-c-util version

Essentially wording improvement.

Modified:
  trunk/include/inn/buffer.h
  trunk/lib/buffer.c
  trunk/lib/fdflag.c
  trunk/m4/socket.m4

----------------------+
 include/inn/buffer.h |    6 +++---
 lib/buffer.c         |   12 ++++++------
 lib/fdflag.c         |   10 ++++++----
 m4/socket.m4         |    4 ++--
 4 files changed, 17 insertions(+), 15 deletions(-)

Modified: include/inn/buffer.h
===================================================================
--- include/inn/buffer.h	2014-08-30 11:55:13 UTC (rev 9660)
+++ include/inn/buffer.h	2014-08-30 11:56:11 UTC (rev 9661)
@@ -2,13 +2,13 @@
  *
  * Counted, reusable memory buffer.
  *
- * A buffer is an allocated bit of memory with a known size and a separate
+ * A buffer is an allocated block of memory with a known size and a separate
  * data length.  It's intended to store strings and can be reused repeatedly
  * to minimize the number of memory allocations.  Buffers increase in
  * increments of 1K, or double for some operations.
  *
- * A buffer contains a notion of the data that's been used and the data
- * that's been left, used when the buffer is an I/O buffer where lots of data
+ * A buffer contains a record of what data has been used and what data is as
+ * yet unprocessed, used when the buffer is an I/O buffer where lots of data
  * is buffered and then slowly processed out of the buffer.  The total length
  * of the data is used + left.  If a buffer is just used to store some data,
  * used can be set to 0 and left stores the length of the data.

Modified: lib/buffer.c
===================================================================
--- lib/buffer.c	2014-08-30 11:55:13 UTC (rev 9660)
+++ lib/buffer.c	2014-08-30 11:56:11 UTC (rev 9661)
@@ -2,16 +2,16 @@
  *
  * Counted, reusable memory buffer.
  *
- * A buffer is an allocated bit of memory with a known size and a separate
+ * A buffer is an allocated block of memory with a known size and a separate
  * data length.  It's intended to store strings and can be reused repeatedly
  * to minimize the number of memory allocations.  Buffers increase in
  * increments of 1K, or double for some operations.
  *
- * A buffer contains data that's been used and the data that's been left, used
- * when the buffer is an I/O buffer where lots of data is buffered and then
- * slowly processed out of the buffer.  The total length of the data is used +
- * left.  If a buffer is just used to store some data, used can be set to 0
- * and left stores the length of the data.
+ * A buffer contains a record of what data has been used and what data is as
+ * yet unprocessed, used when the buffer is an I/O buffer where lots of data
+ * is buffered and then slowly processed out of the buffer.  The total length
+ * of the data is used + left.  If a buffer is just used to store some data,
+ * used can be set to 0 and left stores the length of the data.
  *
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.

Modified: lib/fdflag.c
===================================================================
--- lib/fdflag.c	2014-08-30 11:55:13 UTC (rev 9660)
+++ lib/fdflag.c	2014-08-30 11:56:11 UTC (rev 9661)
@@ -35,9 +35,6 @@
 #include "clibrary.h"
 #include <errno.h>
 
-#include "inn/fdflag.h"
-#include "inn/libinn.h"
-
 #ifdef _WIN32
 # include <winsock2.h>
 #else
@@ -50,6 +47,8 @@
 # endif
 #endif
 
+#include "inn/fdflag.h"
+#include "inn/libinn.h"
 
 /*
  * Set a file to close-on-exec (or clear that setting if the flag is false),
@@ -60,7 +59,10 @@
  * Do it right anyway; it's not that expensive.
  *
  * Stub this out on Windows, where it's not supported (at least currently by
- * this utility library).
+ * this utility library).  Do not use socket_type for the first parameter,
+ * since it's meaningful to set file descriptors for regular files to
+ * close-on-exec (even though this is currently irrelevant since the function
+ * isn't supported on Windows).
  */
 #ifdef _WIN32
 bool

Modified: m4/socket.m4
===================================================================
--- m4/socket.m4	2014-08-30 11:55:13 UTC (rev 9660)
+++ m4/socket.m4	2014-08-30 11:56:11 UTC (rev 9661)
@@ -67,8 +67,8 @@
     [AC_DEFINE([HAVE_GETADDRINFO_ADDRCONFIG], 1,
         [Define if the AI_ADDRCONFIG flag works with getaddrinfo.])])])
 
-dnl Source used by INN_IN6_EQ_BROKEN.  Test borrowed from a bug report by
-dnl tmoestl at gmx.net for glibc.
+dnl Source used by INN_MACRO_IN6_ARE_ADDR_EQUAL.  Test borrowed from a bug
+dnl report by tmoestl at gmx.net for glibc.
 AC_DEFUN([_INN_MACRO_IN6_ARE_ADDR_EQUAL_SOURCE], [[
 #include <sys/types.h>
 #include <sys/socket.h>



More information about the inn-committers mailing list