INN commit: trunk (12 files)
INN Commit
rra at isc.org
Thu Sep 4 19:45:26 UTC 2014
Date: Thursday, September 4, 2014 @ 12:45:26
Author: iulius
Revision: 9675
sync a few tests and headers with upstream
Better header inclusions, especially portable/socket.h instead of
standard netinet/in.h for inet_aton and inet_ntoa tests. Also deactivate
the Wformat-nonliteral warning for the snprintf test suite.
Modified:
trunk/include/inn/buffer.h
trunk/include/inn/fdflag.h
trunk/tests/lib/asprintf-t.c
trunk/tests/lib/getnameinfo-t.c
trunk/tests/lib/inet_aton-t.c
trunk/tests/lib/inet_ntoa-t.c
trunk/tests/lib/inet_ntop-t.c
trunk/tests/lib/mkstemp-t.c
trunk/tests/lib/setenv-t.c
trunk/tests/lib/snprintf-t.c
trunk/tests/lib/strlcat-t.c
trunk/tests/lib/strlcpy-t.c
---------------------------+
include/inn/buffer.h | 3 ++-
include/inn/fdflag.h | 2 +-
tests/lib/asprintf-t.c | 7 +++----
tests/lib/getnameinfo-t.c | 10 ++++------
tests/lib/inet_aton-t.c | 9 ++++-----
tests/lib/inet_ntoa-t.c | 9 ++++-----
tests/lib/inet_ntop-t.c | 8 ++++----
tests/lib/mkstemp-t.c | 8 ++++----
tests/lib/setenv-t.c | 10 ++++------
tests/lib/snprintf-t.c | 11 +++++------
tests/lib/strlcat-t.c | 7 +++----
tests/lib/strlcpy-t.c | 7 +++----
12 files changed, 41 insertions(+), 50 deletions(-)
Modified: include/inn/buffer.h
===================================================================
--- include/inn/buffer.h 2014-09-04 19:39:19 UTC (rev 9674)
+++ include/inn/buffer.h 2014-09-04 19:45:26 UTC (rev 9675)
@@ -44,9 +44,10 @@
#ifndef INN_BUFFER_H
#define INN_BUFFER_H 1
+#include "config.h"
+
#include <stdarg.h>
#include <sys/types.h>
-#include <inn/defines.h>
struct buffer {
size_t size; /* Total allocated length. */
Modified: include/inn/fdflag.h
===================================================================
--- include/inn/fdflag.h 2014-09-04 19:39:19 UTC (rev 9674)
+++ include/inn/fdflag.h 2014-09-04 19:45:26 UTC (rev 9675)
@@ -31,7 +31,7 @@
#ifndef INN_FDFLAG_H
#define INN_FDFLAG_H 1
-#include <inn/defines.h>
+#include "config.h"
#include "portable/socket.h"
BEGIN_DECLS
Modified: tests/lib/asprintf-t.c
===================================================================
--- tests/lib/asprintf-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/asprintf-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* asprintf and vasprintf test suite.
- *
- * $Id$
*
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
Modified: tests/lib/getnameinfo-t.c
===================================================================
--- tests/lib/getnameinfo-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/getnameinfo-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* getnameinfo test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
@@ -23,9 +22,8 @@
#include "clibrary.h"
#include "portable/socket.h"
-#include "inn/messages.h"
-#include "inn/libinn.h"
#include "tap/basic.h"
+#include "inn/libinn.h"
int test_getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t,
char *, socklen_t, int);
Modified: tests/lib/inet_aton-t.c
===================================================================
--- tests/lib/inet_aton-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/inet_aton-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* inet_aton test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
@@ -21,7 +20,7 @@
#include "config.h"
#include "clibrary.h"
-#include <netinet/in.h>
+#include "portable/socket.h"
#include "tap/basic.h"
Modified: tests/lib/inet_ntoa-t.c
===================================================================
--- tests/lib/inet_ntoa-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/inet_ntoa-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* inet_ntoa test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
@@ -21,7 +20,7 @@
#include "config.h"
#include "clibrary.h"
-#include <netinet/in.h>
+#include "portable/socket.h"
#include "tap/basic.h"
Modified: tests/lib/inet_ntop-t.c
===================================================================
--- tests/lib/inet_ntop-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/inet_ntop-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* inet_ntop test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
@@ -22,6 +21,7 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
+
#include <errno.h>
#include "tap/basic.h"
Modified: tests/lib/mkstemp-t.c
===================================================================
--- tests/lib/mkstemp-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/mkstemp-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* mkstemp test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
@@ -21,6 +20,7 @@
#include "config.h"
#include "clibrary.h"
+
#include <errno.h>
#include <sys/stat.h>
Modified: tests/lib/setenv-t.c
===================================================================
--- tests/lib/setenv-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/setenv-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* setenv test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
@@ -21,10 +20,9 @@
#include "config.h"
#include "clibrary.h"
+
#include <errno.h>
-#include "inn/messages.h"
-#include "inn/libinn.h"
#include "tap/basic.h"
int test_setenv(const char *name, const char *value, int overwrite);
Modified: tests/lib/snprintf-t.c
===================================================================
--- tests/lib/snprintf-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/snprintf-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,14 +1,13 @@
-/*
+/* $Id$
+ *
* snprintf test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
* Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006
- * Russ Allbery <rra at stanford.edu>
+ * Russ Allbery <eagle at eyrie.org>
* Copyright 2009, 2010
* The Board of Trustees of the Leland Stanford Junior University
* Copyright 1995 Patrick Powell
@@ -30,7 +29,7 @@
* Disable the requirement that format strings be literals. We need variable
* formats for easy testing.
*/
-//#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
/*
* Intentionally don't add the printf attribute here since we pass a
Modified: tests/lib/strlcat-t.c
===================================================================
--- tests/lib/strlcat-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/strlcat-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* strlcat test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
Modified: tests/lib/strlcpy-t.c
===================================================================
--- tests/lib/strlcpy-t.c 2014-09-04 19:39:19 UTC (rev 9674)
+++ tests/lib/strlcpy-t.c 2014-09-04 19:45:26 UTC (rev 9675)
@@ -1,12 +1,11 @@
-/*
+/* $Id$
+ *
* strlcpy test suite.
*
- * $Id$
- *
* 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/>.
*
- * Written by Russ Allbery <rra at stanford.edu>
+ * Written by Russ Allbery <eagle at eyrie.org>
*
* The authors hereby relinquish any claim to any copyright that they may have
* in this work, whether granted under contract or by operation of law or
More information about the inn-committers
mailing list