diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-02-02 12:06:07 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-02 13:39:04 +0000 |
| commit | e5f4ef0c42219e45498dd8a418464ab5d5263d22 (patch) | |
| tree | 0b03a5b728839903deea3ed31d65e3c042d8ecb2 | |
| parent | d9368545f40e2b1b309976a8ed720437d7ea69fa (diff) | |
ui: use SPDX identifiers.
Change-Id: I6b05399395bcc35e59b73b4030ba4a05711a7b1a
Reviewed-on: https://code.wireshark.org/review/25565
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
79 files changed, 79 insertions, 1110 deletions
diff --git a/ui/alert_box.c b/ui/alert_box.c index 907a04a81a..b7aa64e354 100644 --- a/ui/alert_box.c +++ b/ui/alert_box.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/alert_box.h b/ui/alert_box.h index 5d392e7107..6070208b35 100644 --- a/ui/alert_box.h +++ b/ui/alert_box.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __ALERT_BOX_H__ #define __ALERT_BOX_H__ diff --git a/ui/all_files_wildcard.h b/ui/all_files_wildcard.h index 184b8dca6a..82aa6a0789 100644 --- a/ui/all_files_wildcard.h +++ b/ui/all_files_wildcard.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __ALL_FILES_WILDCARD_H__ #define __ALL_FILES_WILDCARD_H__ diff --git a/ui/capture_globals.h b/ui/capture_globals.h index 916bd37516..38c1acdd75 100644 --- a/ui/capture_globals.h +++ b/ui/capture_globals.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __CAPTURE_GLOBALS_H__ #define __CAPTURE_GLOBALS_H__ diff --git a/ui/commandline.c b/ui/commandline.c index 66e4d63d23..e29a64ebb2 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/commandline.h b/ui/commandline.h index 344805f1e1..ef2b204b37 100644 --- a/ui/commandline.h +++ b/ui/commandline.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __COMMANDLINE_H__ #define __COMMANDLINE_H__ diff --git a/ui/console.c b/ui/console.c index 23419119d0..2a791288bc 100644 --- a/ui/console.c +++ b/ui/console.c @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/console.h b/ui/console.h index 53343d1ab1..48c775c7c4 100644 --- a/ui/console.h +++ b/ui/console.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c index 321cfc5209..e52bb67d87 100644 --- a/ui/decode_as_utils.c +++ b/ui/decode_as_utils.c @@ -5,20 +5,7 @@ * By David Hampton <dhampton@mac.com> * Copyright 2001 David Hampton * - * 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+*/ #include "config.h" #include <stdlib.h> diff --git a/ui/decode_as_utils.h b/ui/decode_as_utils.h index 7ae3b7cd08..9b2d9e8b67 100644 --- a/ui/decode_as_utils.h +++ b/ui/decode_as_utils.h @@ -5,20 +5,7 @@ * By David Hampton <dhampton@mac.com> * Copyright 2001 David Hampton * - * 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+* */ #ifndef __DECODE_AS_UTILS_H__ diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c index 6b2ac21121..18ccf552f7 100644 --- a/ui/dissect_opts.c +++ b/ui/dissect_opts.c @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include <config.h> diff --git a/ui/dissect_opts.h b/ui/dissect_opts.h index 9ed08a7529..fb7cd02121 100644 --- a/ui/dissect_opts.h +++ b/ui/dissect_opts.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ /** @file diff --git a/ui/export_object_ui.c b/ui/export_object_ui.c index 2db2fe5516..c24e5bf9a2 100644 --- a/ui/export_object_ui.c +++ b/ui/export_object_ui.c @@ -6,21 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #include "config.h" diff --git a/ui/export_object_ui.h b/ui/export_object_ui.h index a1cbf81b58..e58083ec76 100644 --- a/ui/export_object_ui.h +++ b/ui/export_object_ui.h @@ -6,21 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __EXPORT_OBJECT_UI_H__ #define __EXPORT_OBJECT_UI_H__ diff --git a/ui/export_pdu_ui_utils.c b/ui/export_pdu_ui_utils.c index 8a56fee2e7..b9216aa594 100644 --- a/ui/export_pdu_ui_utils.c +++ b/ui/export_pdu_ui_utils.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/export_pdu_ui_utils.h b/ui/export_pdu_ui_utils.h index 54cbd13063..80556600ee 100644 --- a/ui/export_pdu_ui_utils.h +++ b/ui/export_pdu_ui_utils.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef EXPORT_PDU_UI_UTILS_H #define EXPORT_PDU_UI_UTILS_H diff --git a/ui/failure_message.c b/ui/failure_message.c index 93dcf166e1..9c200d08cd 100644 --- a/ui/failure_message.c +++ b/ui/failure_message.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/failure_message.h b/ui/failure_message.h index 9749eb7178..ae37f63cf7 100644 --- a/ui/failure_message.h +++ b/ui/failure_message.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __FAILURE_MESSAGE_H__ #define __FAILURE_MESSAGE_H__ diff --git a/ui/file_dialog.h b/ui/file_dialog.h index 7003a5881e..15aed533b5 100644 --- a/ui/file_dialog.h +++ b/ui/file_dialog.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 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+*/ #ifndef __FILE_DIALOG_H__ #define __FILE_DIALOG_H__ diff --git a/ui/filter_files.c b/ui/filter_files.c index 54b7bf262d..3748eec98c 100644 --- a/ui/filter_files.c +++ b/ui/filter_files.c @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include <config.h> diff --git a/ui/filter_files.h b/ui/filter_files.h index 57445d4fdc..e0d4551a10 100644 --- a/ui/filter_files.h +++ b/ui/filter_files.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __UI_FILTERS_H__ #define __UI_FILTERS_H__ diff --git a/ui/firewall_rules.c b/ui/firewall_rules.c index 2b644e9e20..55dbcc8881 100644 --- a/ui/firewall_rules.c +++ b/ui/firewall_rules.c @@ -1,19 +1,6 @@ /* firewall_rules_dlg.c * - * 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+*/ /* * Generate firewall ACL rules based on packet addresses and ports. diff --git a/ui/firewall_rules.h b/ui/firewall_rules.h index 690793c41b..aa7174833f 100644 --- a/ui/firewall_rules.h +++ b/ui/firewall_rules.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 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+ */ #ifndef __UI_FIREWALL_RULES_H__ #define __UI_FIREWALL_RULES_H__ diff --git a/ui/help_url.c b/ui/help_url.c index a462429aa7..fd4d7f6fde 100644 --- a/ui/help_url.c +++ b/ui/help_url.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2000 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+*/ #include "config.h" diff --git a/ui/help_url.h b/ui/help_url.h index 658dda90cf..672c9f183a 100644 --- a/ui/help_url.h +++ b/ui/help_url.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2000 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+* */ #ifndef __HELP_URL_H__ diff --git a/ui/iface_lists.c b/ui/iface_lists.c index e249029fe7..d4d394d4b1 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/iface_lists.h b/ui/iface_lists.h index 0c40f02f17..ad80010a46 100644 --- a/ui/iface_lists.h +++ b/ui/iface_lists.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __IFACE_LISTS_H__ #define __IFACE_LISTS_H__ diff --git a/ui/iface_toolbar.c b/ui/iface_toolbar.c index 0e16456ee4..f84851867e 100644 --- a/ui/iface_toolbar.c +++ b/ui/iface_toolbar.c @@ -4,20 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/iface_toolbar.h b/ui/iface_toolbar.h index 5a5421cad7..13d8acf6cb 100644 --- a/ui/iface_toolbar.h +++ b/ui/iface_toolbar.h @@ -4,20 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __IFACE_TOOLBAR_H__ #define __IFACE_TOOLBAR_H__ diff --git a/ui/io_graph_item.c b/ui/io_graph_item.c index 641edfd478..6608f103f2 100644 --- a/ui/io_graph_item.c +++ b/ui/io_graph_item.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/io_graph_item.h b/ui/io_graph_item.h index 8400e160b1..f7dded0db4 100644 --- a/ui/io_graph_item.h +++ b/ui/io_graph_item.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __IO_GRAPH_ITEM_H__ #define __IO_GRAPH_ITEM_H__ diff --git a/ui/language.c b/ui/language.c index d8da1fef28..f9eedad83b 100644 --- a/ui/language.c +++ b/ui/language.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/language.h b/ui/language.h index 988461befc..ee277c98f7 100644 --- a/ui/language.h +++ b/ui/language.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __LANGUAGE_H__ #define __LANGUAGE_H__ diff --git a/ui/last_open_dir.h b/ui/last_open_dir.h index b35924f659..ede7378f1b 100644 --- a/ui/last_open_dir.h +++ b/ui/last_open_dir.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __UI_LAST_OPEN_DIR_H__ #define __UI_LAST_OPEN_DIR_H__ diff --git a/ui/main_statusbar.h b/ui/main_statusbar.h index 20d1785d08..ea4788edfe 100644 --- a/ui/main_statusbar.h +++ b/ui/main_statusbar.h @@ -4,20 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __MAIN_STATUSBAR_H__ #define __MAIN_STATUSBAR_H__ diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index badc1fcf36..fbaf0ac1d0 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -12,19 +12,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #include "config.h" diff --git a/ui/mcast_stream.h b/ui/mcast_stream.h index bd871c485b..78278bef8f 100644 --- a/ui/mcast_stream.h +++ b/ui/mcast_stream.h @@ -12,20 +12,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __MCAST_STREAM_H__ #define __MCAST_STREAM_H__ diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c index 3084e5b22c..3c13c2dfdf 100644 --- a/ui/packet_list_utils.c +++ b/ui/packet_list_utils.c @@ -6,21 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #include "config.h" diff --git a/ui/packet_list_utils.h b/ui/packet_list_utils.h index 08b6310fa5..d8cbad72f5 100644 --- a/ui/packet_list_utils.h +++ b/ui/packet_list_utils.h @@ -4,21 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __PACKET_LIST_UTILS_H__ #define __PACKET_LIST_UTILS_H__ diff --git a/ui/packet_range.c b/ui/packet_range.c index db9b5919e2..abd791a5a5 100644 --- a/ui/packet_range.c +++ b/ui/packet_range.c @@ -8,20 +8,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/packet_range.h b/ui/packet_range.h index b4b929b57b..fce2884181 100644 --- a/ui/packet_range.h +++ b/ui/packet_range.h @@ -8,20 +8,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __PACKET_RANGE_H__ #define __PACKET_RANGE_H__ diff --git a/ui/persfilepath_opt.c b/ui/persfilepath_opt.c index d1569605a7..04d7c13cb5 100644 --- a/ui/persfilepath_opt.c +++ b/ui/persfilepath_opt.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/persfilepath_opt.h b/ui/persfilepath_opt.h index 0edd5e57a0..7229d3e4db 100644 --- a/ui/persfilepath_opt.h +++ b/ui/persfilepath_opt.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef PERSFILEPATH_OPT_H #define PERSFILEPATH_OPT_H diff --git a/ui/profile.c b/ui/profile.c index c01d115492..b8b51fda2e 100644 --- a/ui/profile.c +++ b/ui/profile.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/profile.h b/ui/profile.h index 76bb393968..00e579f4d5 100644 --- a/ui/profile.h +++ b/ui/profile.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __PROFILE_H__ #define __PROFILE_H__ diff --git a/ui/progress_dlg.h b/ui/progress_dlg.h index 531784679e..8cfc30ac46 100644 --- a/ui/progress_dlg.h +++ b/ui/progress_dlg.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __PROGRESS_DLG_H__ #define __PROGRESS_DLG_H__ diff --git a/ui/recent_utils.h b/ui/recent_utils.h index 51b6d105b3..01c939b16d 100644 --- a/ui/recent_utils.h +++ b/ui/recent_utils.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __UI_RECENT_UTILS_H__ #define __UI_RECENT_UTILS_H__ diff --git a/ui/rtp_media.c b/ui/rtp_media.c index 93f1f0b8ea..d16d50bca3 100644 --- a/ui/rtp_media.c +++ b/ui/rtp_media.c @@ -9,20 +9,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1999 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+*/ #include "config.h" diff --git a/ui/rtp_media.h b/ui/rtp_media.h index 222be304b9..dc18632505 100644 --- a/ui/rtp_media.h +++ b/ui/rtp_media.h @@ -9,20 +9,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1999 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+*/ #ifndef __RTP_MEDIA_H__ #define __RTP_MEDIA_H__ diff --git a/ui/rtp_stream.c b/ui/rtp_stream.c index 01b6198345..f17a77474f 100644 --- a/ui/rtp_stream.c +++ b/ui/rtp_stream.c @@ -8,20 +8,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #include "config.h" diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h index 602dce5c41..bad4fbd0db 100644 --- a/ui/rtp_stream.h +++ b/ui/rtp_stream.h @@ -8,20 +8,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __RTP_STREAM_H__ #define __RTP_STREAM_H__ diff --git a/ui/service_response_time.c b/ui/service_response_time.c index cf8267ed57..100fc34674 100644 --- a/ui/service_response_time.c +++ b/ui/service_response_time.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "service_response_time.h" diff --git a/ui/service_response_time.h b/ui/service_response_time.h index dcad54539e..230c5a02b5 100644 --- a/ui/service_response_time.h +++ b/ui/service_response_time.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ /** @file * Helper routines common to all service response time statistics taps. diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h index 149201ce11..218c2c34a6 100644 --- a/ui/simple_dialog.h +++ b/ui/simple_dialog.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __SIMPLE_DIALOG_UI_H__ #define __SIMPLE_DIALOG_UI_H__ diff --git a/ui/software_update.c b/ui/software_update.c index c82eb28505..2cc90c3ee1 100644 --- a/ui/software_update.c +++ b/ui/software_update.c @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/software_update.h b/ui/software_update.h index a7ba154960..cb817f6282 100644 --- a/ui/software_update.h +++ b/ui/software_update.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __SOFTWARE_UPDATE_H__ #define __SOFTWARE_UPDATE_H__ diff --git a/ui/ssl_key_export.c b/ui/ssl_key_export.c index 2c2b88870e..54883ba47e 100644 --- a/ui/ssl_key_export.c +++ b/ui/ssl_key_export.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/ssl_key_export.h b/ui/ssl_key_export.h index 35348e0559..54a17a51ef 100644 --- a/ui/ssl_key_export.h +++ b/ui/ssl_key_export.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __SSL_KEY_EXPORT_H__ #define __SSL_KEY_EXPORT_H__ diff --git a/ui/tap-iax2-analysis.c b/ui/tap-iax2-analysis.c index b5d43b30eb..ec1e93695b 100644 --- a/ui/tap-iax2-analysis.c +++ b/ui/tap-iax2-analysis.c @@ -13,20 +13,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #include "config.h" diff --git a/ui/tap-iax2-analysis.h b/ui/tap-iax2-analysis.h index 9f4b4b467c..2246a47aef 100644 --- a/ui/tap-iax2-analysis.h +++ b/ui/tap-iax2-analysis.h @@ -13,20 +13,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __TAP_IAX2_ANALYSIS_H__ #define __TAP_IAX2_ANALYSIS_H__ diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index f06afe76bb..93a494a897 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/tap-rlc-graph.h b/ui/tap-rlc-graph.h index e8032b0a65..1dcf49274d 100644 --- a/ui/tap-rlc-graph.h +++ b/ui/tap-rlc-graph.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __TAP_RLC_GRAPH_H__ #define __TAP_RLC_GRAPH_H__ diff --git a/ui/tap-rtp-analysis.h b/ui/tap-rtp-analysis.h index 2c782a36f0..937ab9e1db 100644 --- a/ui/tap-rtp-analysis.h +++ b/ui/tap-rtp-analysis.h @@ -12,20 +12,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __TAP_RTP_ANALYSIS_H__ #define __TAP_RTP_ANALYSIS_H__ diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 3f17c43896..e87f64872b 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/tap-tcp-stream.h b/ui/tap-tcp-stream.h index 452f20d1ea..69e584fca5 100644 --- a/ui/tap-tcp-stream.h +++ b/ui/tap-tcp-stream.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __TAP_TCP_STREAM_H__ #define __TAP_TCP_STREAM_H__ diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index e538545140..53b1e7de65 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/tap_export_pdu.h b/ui/tap_export_pdu.h index 49e46ebeff..d5adb25887 100644 --- a/ui/tap_export_pdu.h +++ b/ui/tap_export_pdu.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __TAP_EXPORT_PDU_H__ #define __TAP_EXPORT_PDU_H__ diff --git a/ui/text_import.c b/ui/text_import.c index 812d34e64b..4b5b7b002d 100644 --- a/ui/text_import.c +++ b/ui/text_import.c @@ -8,21 +8,7 @@ * * Based on text2pcap.c by Ashok Narayanan <ashokn@cisco.com> * - * 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+ */ /******************************************************************************* * diff --git a/ui/text_import.h b/ui/text_import.h index 71ee2a2948..f516f9c382 100644 --- a/ui/text_import.h +++ b/ui/text_import.h @@ -9,20 +9,7 @@ * * Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com> * - * 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+* *******************************************************************************/ diff --git a/ui/text_import_scanner.h b/ui/text_import_scanner.h index a84d2e1fe1..6d1d48c73d 100644 --- a/ui/text_import_scanner.h +++ b/ui/text_import_scanner.h @@ -9,20 +9,7 @@ * * Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com> * - * 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+* *******************************************************************************/ diff --git a/ui/time_shift.c b/ui/time_shift.c index 4f82b3348c..446e7b6dcc 100644 --- a/ui/time_shift.c +++ b/ui/time_shift.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" diff --git a/ui/time_shift.h b/ui/time_shift.h index 6b64561c57..ac8ff26796 100644 --- a/ui/time_shift.h +++ b/ui/time_shift.h @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __TIME_SHIFT_H__ #define __TIME_SHIFT_H__ diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c index 36308daf22..8baba47127 100644 --- a/ui/traffic_table_ui.c +++ b/ui/traffic_table_ui.c @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" #include <glib.h> diff --git a/ui/traffic_table_ui.h b/ui/traffic_table_ui.h index 66e711a53a..eefa29fee4 100644 --- a/ui/traffic_table_ui.h +++ b/ui/traffic_table_ui.h @@ -6,20 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __CONVERSATION_UI_H__ #define __CONVERSATION_UI_H__ @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #include "config.h" @@ -5,20 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __UTIL_H__ #define __UTIL_H__ diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 9fa3c00e01..f95f62bd1b 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -16,20 +16,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #include "config.h" diff --git a/ui/voip_calls.h b/ui/voip_calls.h index aed1facbbb..f0ab9ac7bd 100644 --- a/ui/voip_calls.h +++ b/ui/voip_calls.h @@ -16,20 +16,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+ */ #ifndef __VOIP_CALLS_H__ #define __VOIP_CALLS_H__ diff --git a/ui/ws_ui_util.h b/ui/ws_ui_util.h index 053a992ed5..b0bc885234 100644 --- a/ui/ws_ui_util.h +++ b/ui/ws_ui_util.h @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * 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+*/ #ifndef __UI_UTIL_H__ #define __UI_UTIL_H__ |