INN commit: trunk (4 files)

INN Commit rra at isc.org
Fri Dec 29 05:40:06 UTC 2017


    Date: Thursday, December 28, 2017 @ 21:40:06
  Author: eagle
Revision: 10205

Clean up some more bits from removing lib/memcmp.c

Modified:
  trunk/MANIFEST
  trunk/tests/Makefile
  trunk/tests/TESTS
Deleted:
  trunk/tests/lib/memcmp-t.c

----------------------+
 MANIFEST             |    2 --
 tests/Makefile       |    8 +-------
 tests/TESTS          |    1 -
 tests/lib/memcmp-t.c |   34 ----------------------------------
 4 files changed, 1 insertion(+), 44 deletions(-)

Modified: MANIFEST
===================================================================
--- MANIFEST	2017-12-29 05:32:03 UTC (rev 10204)
+++ MANIFEST	2017-12-29 05:40:06 UTC (rev 10205)
@@ -521,7 +521,6 @@
 lib/lockfile.c                        Try to lock a file descriptor
 lib/makedir.c                         Make directory recursively
 lib/md5.c                             MD5 checksum calculation
-lib/memcmp.c                          memcmp replacement
 lib/messageid.c                       Functions for message-IDs
 lib/messages.c                        Error reporting and debug output
 lib/mkstemp.c                         mkstemp replacement
@@ -899,7 +898,6 @@
 tests/lib/innconf-t.c                 Tests for lib/innconf.c
 tests/lib/list-t.c                    Tests for lib/list.c
 tests/lib/md5-t.c                     Tests for lib/md5.c
-tests/lib/memcmp-t.c                  Tests for lib/memcmp.c
 tests/lib/messageid-t.c               Tests for lib/messageid.c
 tests/lib/messages-t.c                Tests for lib/messages.c
 tests/lib/mkstemp-t.c                 Tests for lib/mkstemp.c

Modified: tests/Makefile
===================================================================
--- tests/Makefile	2017-12-29 05:32:03 UTC (rev 10204)
+++ tests/Makefile	2017-12-29 05:40:06 UTC (rev 10205)
@@ -21,7 +21,7 @@
 	lib/getaddrinfo.t lib/getnameinfo.t lib/hash.t \
 	lib/hashtab.t lib/headers.t lib/hex.t lib/inet_aton.t \
 	lib/inet_ntoa.t lib/inet_ntop.t lib/innconf.t lib/list.t lib/md5.t \
-	lib/memcmp.t lib/messageid.t lib/messages.t lib/mkstemp.t \
+	lib/messageid.t lib/messages.t lib/mkstemp.t \
 	lib/network/addr-ipv4.t lib/network/addr-ipv6.t \
 	lib/network/client.t lib/network/server.t \
 	lib/pread.t lib/pwrite.t lib/qio.t lib/reallocarray.t \
@@ -167,12 +167,6 @@
 lib/md5.t: lib/md5-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/md5-t.o tap/basic.o $(LIBINN)
 
-lib/memcmp.o: ../lib/memcmp.c
-	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/memcmp.c
-
-lib/memcmp.t: lib/memcmp.o lib/memcmp-t.o tap/basic.o $(LIBINN)
-	$(LINK) lib/memcmp.o lib/memcmp-t.o tap/basic.o $(LIBINN)
-
 lib/messageid.t: lib/messageid-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/messageid-t.o tap/basic.o $(LIBINN)
 

Modified: tests/TESTS
===================================================================
--- tests/TESTS	2017-12-29 05:32:03 UTC (rev 10204)
+++ tests/TESTS	2017-12-29 05:40:06 UTC (rev 10205)
@@ -25,7 +25,6 @@
 lib/innconf
 lib/list
 lib/md5
-lib/memcmp
 lib/messageid
 lib/messages
 lib/mkstemp

Deleted: tests/lib/memcmp-t.c
===================================================================
--- tests/lib/memcmp-t.c	2017-12-29 05:32:03 UTC (rev 10204)
+++ tests/lib/memcmp-t.c	2017-12-29 05:40:06 UTC (rev 10205)
@@ -1,34 +0,0 @@
-/* $Id$ */
-/* memcmp test suite. */
-
-#include "config.h"
-#include <stdio.h>
-#include <sys/types.h>
-
-#include "tap/basic.h"
-
-int test_memcmp(const void *, const void *, size_t);
-
-int
-main(void)
-{
-    test_init(15);
-
-    ok( 1, test_memcmp("",             "",             0) == 0);
-    ok( 2, test_memcmp("",             "",             1) == 0);
-    ok( 3, test_memcmp("alpha",        "alpha",        6) == 0);
-    ok( 4, test_memcmp("alpha",        "beta",         5)  < 0);
-    ok( 5, test_memcmp("beta",         "alpha",        5)  > 0);
-    ok( 6, test_memcmp("alpha",        "apple",        1) == 0);
-    ok( 7, test_memcmp("alpha",        "apple",        2)  < 0);
-    ok( 8, test_memcmp("\0v",          "\0w",          2)  < 0);
-    ok( 9, test_memcmp("\200\201\202", "\200\201\202", 4) == 0);
-    ok(10, test_memcmp("\200\201\202", "\200\201\203", 4)  < 0);
-    ok(11, test_memcmp("\200\201\203", "\200\201\202", 4)  > 0);
-    ok(12, test_memcmp("al\0po",       "al\0pha",      6)  > 0);
-    ok(13, test_memcmp("\100",         "\201",         1)  < 0);
-    ok(14, test_memcmp("\200",         "\201",         1)  < 0);
-    ok(15, test_memcmp("a",            "b",            0) == 0);
-
-    return 0;
-}



More information about the inn-committers mailing list