diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-03-08 11:18:49 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-09 04:50:23 +0000 |
| commit | e7ab7a907c16be8eabb426958b459aefc0631549 (patch) | |
| tree | 611f2be6a2a6280236b3e637e73d6ed08df693c8 /wiretap | |
| parent | fdd426e410325db3f33a16f77739f8f73575af2c (diff) | |
spdx: more licenses converted.
Change-Id: I8f6693108c43959e54911d35b4fbf730c59add60
Reviewed-on: https://code.wireshark.org/review/26361
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/i4b_trace.h | 21 | ||||
| -rw-r--r-- | wiretap/network_instruments.c | 5 | ||||
| -rw-r--r-- | wiretap/network_instruments.h | 5 |
3 files changed, 3 insertions, 28 deletions
diff --git a/wiretap/i4b_trace.h b/wiretap/i4b_trace.h index 0939c876eb..174278f3a1 100644 --- a/wiretap/i4b_trace.h +++ b/wiretap/i4b_trace.h @@ -1,26 +1,7 @@ /* * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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-2-Clause * *---------------------------------------------------------------------------*/ diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 8e495c9c43..7ea3056d53 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -8,10 +8,7 @@ /*************************************************************************** * * - * 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. * + * SPDX-License-Identifier: GPL-2.0-or-later * * * ***************************************************************************/ diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h index 501ff1f4ab..7754ef8976 100644 --- a/wiretap/network_instruments.h +++ b/wiretap/network_instruments.h @@ -8,10 +8,7 @@ /*************************************************************************** * * - * 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. * + * SPDX-License-Identifier: GPL-2.0-or-later * * * ***************************************************************************/ |