From 71844ed50a35d8bfb03e10061846f726d7f9af9e Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Fri, 2 Feb 2018 11:44:16 +0100 Subject: [PATCH] wsutil: use SPDX identifiers. Change-Id: I4863416ddc425b9138ffa47621eee823db9e7fda Reviewed-on: https://code.wireshark.org/review/25557 Reviewed-by: Anders Broman --- wsutil/getopt_long.c | 16 ++-------------- wsutil/getopt_long.h | 16 ++-------------- wsutil/strnatcmp.c | 18 ++---------------- wsutil/strnatcmp.h | 18 ++---------------- wsutil/wsgetopt.h | 15 +-------------- 5 files changed, 9 insertions(+), 74 deletions(-) diff --git a/wsutil/getopt_long.c b/wsutil/getopt_long.c index c44db3cb7d..3b19fe6c32 100644 --- a/wsutil/getopt_long.c +++ b/wsutil/getopt_long.c @@ -9,20 +9,8 @@ Free Software Foundation, Inc. This file is part of the GNU C Library. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + SPDX-License-Identifier: LGPL-2.0-or-later + */ /* This tells Alpha OSF/1 not to define a getopt prototype in . Ditto for AIX 3.2 and . */ diff --git a/wsutil/getopt_long.h b/wsutil/getopt_long.h index 42afeb9793..03aec05b42 100644 --- a/wsutil/getopt_long.h +++ b/wsutil/getopt_long.h @@ -6,20 +6,8 @@ Free Software Foundation, Inc. This file is part of the GNU C Library. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ + SPDX-License-Identifier: LGPL-2.0-or-later +*/ #ifndef _GETOPT_INT_H #define _GETOPT_INT_H 1 diff --git a/wsutil/strnatcmp.c b/wsutil/strnatcmp.c index 0c971e73fd..37f2310fe6 100644 --- a/wsutil/strnatcmp.c +++ b/wsutil/strnatcmp.c @@ -5,22 +5,8 @@ strnatcmp.c -- Perform 'natural order' comparisons of strings in C. Copyright (C) 2000, 2004 by Martin Pool - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ + SPDX-License-Identifier: Zlib + */ /* partial change history: diff --git a/wsutil/strnatcmp.h b/wsutil/strnatcmp.h index cd175c0347..8f6b7828ef 100644 --- a/wsutil/strnatcmp.h +++ b/wsutil/strnatcmp.h @@ -5,22 +5,8 @@ strnatcmp.c -- Perform 'natural order' comparisons of strings in C. Copyright (C) 2000, 2004 by Martin Pool - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ + SPDX-License-Identifier: Zlib + */ #ifndef STRNATCMP_H #define STRNATCMP_H diff --git a/wsutil/wsgetopt.h b/wsutil/wsgetopt.h index b2a981693b..5892416765 100644 --- a/wsutil/wsgetopt.h +++ b/wsutil/wsgetopt.h @@ -4,20 +4,7 @@ Free Software Foundation, Inc. This file is part of the GNU C Library. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef _GETOPT_H