diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-02-02 11:50:31 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-02-07 06:29:48 +0000 |
commit | 908e25d5aaba5496e73940709e921f45870b849e (patch) | |
tree | 7a17eb55f0caf2c41406335d3d71eb8ae93c6588 /caputils | |
parent | 782054c2d54d5d4bc79c602ee01b5f79a4941662 (diff) |
caputils: use SPDX identifiers.
Change-Id: I7c30002025c31a74dfa60c10ca7f7c0dd384e1c9
Reviewed-on: https://code.wireshark.org/review/25559
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'caputils')
-rw-r--r-- | caputils/airpcap.h | 16 | ||||
-rw-r--r-- | caputils/airpcap_loader.c | 15 | ||||
-rw-r--r-- | caputils/airpcap_loader.h | 15 | ||||
-rw-r--r-- | caputils/capture-pcap-util-int.h | 15 | ||||
-rw-r--r-- | caputils/capture-pcap-util-unix.c | 15 | ||||
-rw-r--r-- | caputils/capture-pcap-util.c | 15 | ||||
-rw-r--r-- | caputils/capture-pcap-util.h | 15 | ||||
-rw-r--r-- | caputils/capture-wpcap.c | 15 | ||||
-rw-r--r-- | caputils/capture-wpcap.h | 15 | ||||
-rw-r--r-- | caputils/capture_ifinfo.h | 15 | ||||
-rw-r--r-- | caputils/capture_win_ifnames.h | 15 | ||||
-rw-r--r-- | caputils/capture_wpcap_packet.c | 15 | ||||
-rw-r--r-- | caputils/capture_wpcap_packet.h | 15 | ||||
-rw-r--r-- | caputils/iface_monitor.c | 15 | ||||
-rw-r--r-- | caputils/iface_monitor.h | 15 | ||||
-rw-r--r-- | caputils/ws80211_utils.h | 15 |
16 files changed, 16 insertions, 225 deletions
diff --git a/caputils/airpcap.h b/caputils/airpcap.h index f11e6a1478..135e9dbb45 100644 --- a/caputils/airpcap.h +++ b/caputils/airpcap.h @@ -2,21 +2,7 @@ * Copyright (c) 2006-2007 CACE Technologies, Davis (California) * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * SPDX-License-Identifier: BSD-3-Clause */ #if !defined(AIRPCAP_H__EAE405F5_0171_9592_B3C2_C19EC426AD34__INCLUDED_) diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 8896bf02e0..916ef60863 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -7,20 +7,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/caputils/airpcap_loader.h b/caputils/airpcap_loader.h index 034f732de1..f47965c32f 100644 --- a/caputils/airpcap_loader.h +++ b/caputils/airpcap_loader.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 __AIRPCAP_LOADER_H__ #define __AIRPCAP_LOADER_H__ diff --git a/caputils/capture-pcap-util-int.h b/caputils/capture-pcap-util-int.h index dc9600f3e1..2993843c13 100644 --- a/caputils/capture-pcap-util-int.h +++ b/caputils/capture-pcap-util-int.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 __PCAP_UTIL_INT_H__ #define __PCAP_UTIL_INT_H__ diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c index 2d94ecc899..a84670746c 100644 --- a/caputils/capture-pcap-util-unix.c +++ b/caputils/capture-pcap-util-unix.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/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index ffe70b6d9d..393a8c3e6e 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.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/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h index 22fb723cf8..2583f9890a 100644 --- a/caputils/capture-pcap-util.h +++ b/caputils/capture-pcap-util.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_PCAP_UTIL_H__ #define __CAPTURE_PCAP_UTIL_H__ diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index eeece46703..321d645744 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -7,20 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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/caputils/capture-wpcap.h b/caputils/capture-wpcap.h index 25378f3f3a..ccb6bad820 100644 --- a/caputils/capture-wpcap.h +++ b/caputils/capture-wpcap.h @@ -4,20 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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_WPCAP_H #define CAPTURE_WPCAP_H diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h index e9ffdf483b..0318e59074 100644 --- a/caputils/capture_ifinfo.h +++ b/caputils/capture_ifinfo.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_IFINFO_H__ #define __CAPTURE_IFINFO_H__ diff --git a/caputils/capture_win_ifnames.h b/caputils/capture_win_ifnames.h index 528c73de14..79d6f29153 100644 --- a/caputils/capture_win_ifnames.h +++ b/caputils/capture_win_ifnames.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 CAPTURE_WIN_IFNAMES_H #define CAPTURE_WIN_IFNAMES_H diff --git a/caputils/capture_wpcap_packet.c b/caputils/capture_wpcap_packet.c index 50a1b4aaf6..d1d4411e9b 100644 --- a/caputils/capture_wpcap_packet.c +++ b/caputils/capture_wpcap_packet.c @@ -8,20 +8,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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/caputils/capture_wpcap_packet.h b/caputils/capture_wpcap_packet.h index f043d89e92..1079d362bc 100644 --- a/caputils/capture_wpcap_packet.h +++ b/caputils/capture_wpcap_packet.h @@ -5,20 +5,7 @@ * Copyright 2001 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_WPCAP_PACKET_H #define CAPTURE_WPCAP_PACKET_H diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c index f9bf13ebb7..830007b199 100644 --- a/caputils/iface_monitor.c +++ b/caputils/iface_monitor.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/caputils/iface_monitor.h b/caputils/iface_monitor.h index abb55b332e..c303a623e8 100644 --- a/caputils/iface_monitor.h +++ b/caputils/iface_monitor.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 IFACE_MONITOR_H #define IFACE_MONITOR_H diff --git a/caputils/ws80211_utils.h b/caputils/ws80211_utils.h index 3e29acd6a0..a1e394fc91 100644 --- a/caputils/ws80211_utils.h +++ b/caputils/ws80211_utils.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 __WS80211_UTILS_H__ #define __WS80211_UTILS_H__ |