From be38102eea170403b66d57d3f8f01ea4d49eaf29 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Fri, 9 Feb 2018 10:14:34 +0100 Subject: [PATCH] caputils/tools: more SPDX convertions. Change-Id: I44a8d1848f768acf4c3b31a68c845264c74e4bba Reviewed-on: https://code.wireshark.org/review/25709 Petri-Dish: Dario Lombardo Reviewed-by: Anders Broman --- caputils/capture_win_ifnames.c | 14 +------------- tools/make-usb.py | 14 +------------- tools/npl/ast.h | 14 +------------- tools/npl/npl.c | 14 +------------- tools/npl/xmem.h | 14 +------------- tools/rdps.py | 14 +------------- 6 files changed, 6 insertions(+), 78 deletions(-) diff --git a/caputils/capture_win_ifnames.c b/caputils/capture_win_ifnames.c index a674f1b020..2d237daee3 100644 --- a/caputils/capture_win_ifnames.c +++ b/caputils/capture_win_ifnames.c @@ -6,19 +6,7 @@ * By Gerald Combs * Copyright 1998 Gerald Combs * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/tools/make-usb.py b/tools/make-usb.py index 2d9c931b56..bc9c6cb236 100755 --- a/tools/make-usb.py +++ b/tools/make-usb.py @@ -105,19 +105,7 @@ header="""/* usb.c * By Gerald Combs * Copyright 1998 Gerald Combs * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/tools/npl/ast.h b/tools/npl/ast.h index 57eca668ec..ac4b5ae931 100644 --- a/tools/npl/ast.h +++ b/tools/npl/ast.h @@ -1,19 +1,7 @@ /* * Copyright 2012-2013, Jakub Zawadzki * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ typedef enum { diff --git a/tools/npl/npl.c b/tools/npl/npl.c index 096b4681ea..b3069928e5 100644 --- a/tools/npl/npl.c +++ b/tools/npl/npl.c @@ -1,19 +1,7 @@ /* * Copyright 2012-2013, Jakub Zawadzki * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ #include diff --git a/tools/npl/xmem.h b/tools/npl/xmem.h index b3f74db404..79e66859ab 100644 --- a/tools/npl/xmem.h +++ b/tools/npl/xmem.h @@ -1,19 +1,7 @@ /* * Copyright 2012-2013, Jakub Zawadzki * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _X_MEM_H diff --git a/tools/rdps.py b/tools/rdps.py index ec5a51fbab..a5aad46d42 100755 --- a/tools/rdps.py +++ b/tools/rdps.py @@ -91,19 +91,7 @@ def main(): * By Gerald Combs * Copyright 1998 Gerald Combs * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ #include