From cc72c823b60e2b6c75664545cf46e07f6b40d94a Mon Sep 17 00:00:00 2001 From: eadler Date: Thu, 29 Mar 2018 02:50:57 +0000 Subject: Revert r330897: This was intended to be a non-functional change. It wasn't. The commit message was thus wrong. In addition it broke arm, and merged crypto related code. Revert with prejudice. This revert skips files touched in r316370 since that commit was since MFCed. This revert also skips files that require $FreeBSD$ property changes. Thank you to those who helped me get out of this mess including but not limited to gonzo, kevans, rgrimes. Requested by: gjb (re) --- share/examples/tests/tests/atf/cp_test.sh | 2 -- share/examples/tests/tests/atf/printf_test.c | 2 -- share/examples/tests/tests/plain/printf_test.c | 5 +---- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'share') diff --git a/share/examples/tests/tests/atf/cp_test.sh b/share/examples/tests/tests/atf/cp_test.sh index 0e88d1a..befec09 100644 --- a/share/examples/tests/tests/atf/cp_test.sh +++ b/share/examples/tests/tests/atf/cp_test.sh @@ -1,7 +1,5 @@ # $FreeBSD$ # -# SPDX-License-Identifier: BSD-3-Clause -# # Copyright 2013 Google Inc. # All rights reserved. # diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c index 5a4cb65..719927c 100644 --- a/share/examples/tests/tests/atf/printf_test.c +++ b/share/examples/tests/tests/atf/printf_test.c @@ -1,7 +1,5 @@ /* $FreeBSD$ * - * SPDX-License-Identifier: BSD-3-Clause - * * Copyright 2013 Google Inc. * All rights reserved. * diff --git a/share/examples/tests/tests/plain/printf_test.c b/share/examples/tests/tests/plain/printf_test.c index 89d96d0..c43269b 100644 --- a/share/examples/tests/tests/plain/printf_test.c +++ b/share/examples/tests/tests/plain/printf_test.c @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ - -/*- - * SPDX-License-Identifier: BSD-3-Clause +/* $FreeBSD$ * * Copyright 2013 Google Inc. * All rights reserved. -- cgit v1.1