aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2018-02-18 22:40:50 +0100
committerMichael Mann <mmann78@netscape.net>2018-02-18 22:50:37 +0000
commitca7ac05cf00bca96a0123540beceb206a788906f (patch)
tree7b8f1c124b12d273de08ba1e840c0e31a49bd97f
parent44a6e2dea8be8e02cdc62a2a89dc79f734ab9f9b (diff)
Fix some source headers, reformat SPDX license lines in comment block.
Change-Id: Ibae6a64a9915003435a3fb17763535a3844143be Reviewed-on: https://code.wireshark.org/review/25891 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--ui/export_object_ui.c3
-rw-r--r--ui/export_object_ui.h3
-rw-r--r--ui/firewall_rules.h3
-rw-r--r--ui/mcast_stream.h3
-rw-r--r--ui/packet_list_utils.c3
-rw-r--r--ui/packet_list_utils.h3
-rw-r--r--ui/rtp_stream.c3
-rw-r--r--ui/rtp_stream.h3
-rw-r--r--ui/tap-iax2-analysis.c3
-rw-r--r--ui/tap-iax2-analysis.h3
-rw-r--r--ui/tap-rtp-analysis.h3
-rw-r--r--ui/text_import.c3
-rw-r--r--ui/voip_calls.c3
-rw-r--r--ui/voip_calls.h3
-rw-r--r--wiretap/camins.c3
-rw-r--r--wiretap/camins.h3
-rw-r--r--wiretap/commview.c3
-rw-r--r--wiretap/commview.h3
-rw-r--r--wiretap/daintree-sna.c3
-rw-r--r--wiretap/merge.c3
-rw-r--r--wiretap/mplog.c3
-rw-r--r--wiretap/mplog.h3
-rw-r--r--wiretap/nettl.c3
-rw-r--r--wiretap/nettl.h3
-rw-r--r--wiretap/packetlogger.c3
-rw-r--r--wiretap/peekclassic.c3
-rw-r--r--wiretap/peektagged.c3
-rw-r--r--wiretap/wtap.h3
28 files changed, 56 insertions, 28 deletions
diff --git a/ui/export_object_ui.c b/ui/export_object_ui.c
index 71e464336b..97b54cfecd 100644
--- a/ui/export_object_ui.c
+++ b/ui/export_object_ui.c
@@ -6,7 +6,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/ui/export_object_ui.h b/ui/export_object_ui.h
index 20b1390005..d0a80a11f1 100644
--- a/ui/export_object_ui.h
+++ b/ui/export_object_ui.h
@@ -6,7 +6,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __EXPORT_OBJECT_UI_H__
#define __EXPORT_OBJECT_UI_H__
diff --git a/ui/firewall_rules.h b/ui/firewall_rules.h
index a1833ec48f..a41a0a6fe6 100644
--- a/ui/firewall_rules.h
+++ b/ui/firewall_rules.h
@@ -5,7 +5,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2006 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __UI_FIREWALL_RULES_H__
#define __UI_FIREWALL_RULES_H__
diff --git a/ui/mcast_stream.h b/ui/mcast_stream.h
index 943fba14ca..89d4baba20 100644
--- a/ui/mcast_stream.h
+++ b/ui/mcast_stream.h
@@ -12,7 +12,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __MCAST_STREAM_H__
#define __MCAST_STREAM_H__
diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c
index 5599cdad14..2d1cd1f471 100644
--- a/ui/packet_list_utils.c
+++ b/ui/packet_list_utils.c
@@ -6,7 +6,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/ui/packet_list_utils.h b/ui/packet_list_utils.h
index d0b7bcd40f..9100088718 100644
--- a/ui/packet_list_utils.h
+++ b/ui/packet_list_utils.h
@@ -4,7 +4,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __PACKET_LIST_UTILS_H__
#define __PACKET_LIST_UTILS_H__
diff --git a/ui/rtp_stream.c b/ui/rtp_stream.c
index 8da569229b..7bfa611fe5 100644
--- a/ui/rtp_stream.c
+++ b/ui/rtp_stream.c
@@ -8,7 +8,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h
index 28342a510f..f2808795a6 100644
--- a/ui/rtp_stream.h
+++ b/ui/rtp_stream.h
@@ -8,7 +8,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __RTP_STREAM_H__
#define __RTP_STREAM_H__
diff --git a/ui/tap-iax2-analysis.c b/ui/tap-iax2-analysis.c
index 1eab3790a1..6d0a86c268 100644
--- a/ui/tap-iax2-analysis.c
+++ b/ui/tap-iax2-analysis.c
@@ -13,7 +13,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/ui/tap-iax2-analysis.h b/ui/tap-iax2-analysis.h
index 04ab172afa..b88b9fd076 100644
--- a/ui/tap-iax2-analysis.h
+++ b/ui/tap-iax2-analysis.h
@@ -13,7 +13,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __TAP_IAX2_ANALYSIS_H__
#define __TAP_IAX2_ANALYSIS_H__
diff --git a/ui/tap-rtp-analysis.h b/ui/tap-rtp-analysis.h
index 23f68e824a..84c7acfa7a 100644
--- a/ui/tap-rtp-analysis.h
+++ b/ui/tap-rtp-analysis.h
@@ -12,7 +12,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __TAP_RTP_ANALYSIS_H__
#define __TAP_RTP_ANALYSIS_H__
diff --git a/ui/text_import.c b/ui/text_import.c
index 244ba2e3b5..a6c7928f70 100644
--- a/ui/text_import.c
+++ b/ui/text_import.c
@@ -8,7 +8,8 @@
*
* Based on text2pcap.c by Ashok Narayanan <ashokn@cisco.com>
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
/*******************************************************************************
*
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 1eed2034b8..4432a60f73 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -16,7 +16,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/ui/voip_calls.h b/ui/voip_calls.h
index 15d7284f76..5a724759f0 100644
--- a/ui/voip_calls.h
+++ b/ui/voip_calls.h
@@ -16,7 +16,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __VOIP_CALLS_H__
#define __VOIP_CALLS_H__
diff --git a/wiretap/camins.c b/wiretap/camins.c
index 7ce669b64b..b24ec7afbd 100644
--- a/wiretap/camins.c
+++ b/wiretap/camins.c
@@ -7,7 +7,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
/* CAM Inspector is a commercial log tool for DVB-CI
diff --git a/wiretap/camins.h b/wiretap/camins.h
index d8b53b23e8..bd5956a624 100644
--- a/wiretap/camins.h
+++ b/wiretap/camins.h
@@ -7,7 +7,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef _CAMINS_H
#define _CAMINS_H
diff --git a/wiretap/commview.c b/wiretap/commview.c
index efd31c019c..1df15f1a88 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -8,7 +8,8 @@
*
* Based on csids.c and nettl.c
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
/* A brief description of this file format is available at:
* http://www.tamos.com/htmlhelp/commview/logformat.htm
diff --git a/wiretap/commview.h b/wiretap/commview.h
index c38df64971..1b58bff65b 100644
--- a/wiretap/commview.h
+++ b/wiretap/commview.h
@@ -4,7 +4,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __COMMVIEW_H__
#define __COMMVIEW_H__
diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c
index fd9393f9c3..b4e32ae066 100644
--- a/wiretap/daintree-sna.c
+++ b/wiretap/daintree-sna.c
@@ -11,7 +11,8 @@
* remains. Borrowed many snippets from dbs-etherwatch.c, the
* daintree_sna_process_hex_data function having the largest chunk.
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
/* This module reads capture files saved by Daintree's Sensor Network Analyzer.
* Daintree captures are plain text files with a two line header,
diff --git a/wiretap/merge.c b/wiretap/merge.c
index 6e40758e03..bf26d8dde6 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -9,7 +9,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/wiretap/mplog.c b/wiretap/mplog.c
index 22e537f600..4992e9eb1c 100644
--- a/wiretap/mplog.c
+++ b/wiretap/mplog.c
@@ -7,7 +7,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
/*
diff --git a/wiretap/mplog.h b/wiretap/mplog.h
index 13a57da37b..65166283e3 100644
--- a/wiretap/mplog.h
+++ b/wiretap/mplog.h
@@ -7,7 +7,8 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef _MPLOG_H
#define _MPLOG_H
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index 870a151f8f..57bf441e31 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -6,7 +6,8 @@
* Enhancements by Mark C. Brown <mbrown@hp.com>
* Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P.
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index a48a5bc0e1..7009d88c69 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -6,7 +6,8 @@
* Enhancements by Mark C. Brown <mbrown@hp.com>
* Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P.
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __NETTL_H__
#define __NETTL_H__
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c
index aca3bc40ee..048299629e 100644
--- a/wiretap/packetlogger.c
+++ b/wiretap/packetlogger.c
@@ -9,7 +9,8 @@
* Based on commview.c, Linux's BlueZ-Gnome Analyzer program and hexdumps of
* the output files from Apple's PacketLogger tool.
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c
index c30beb7cdf..7628189cfa 100644
--- a/wiretap/peekclassic.c
+++ b/wiretap/peekclassic.c
@@ -18,7 +18,8 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
#include <errno.h>
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index d40086fe08..1f533eed35 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -15,7 +15,8 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#include "config.h"
#include <errno.h>
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index d2e328dfaa..5278c9ae73 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -3,7 +3,8 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0-or-later */
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifndef __WTAP_H__
#define __WTAP_H__