Use spdx license identifier instead of GPL blurb.

3 files changed, 14 insertions, 59 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 7e9a4a5f..8ba61ec2 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -1,3 +1,8 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2016-2018 The TokTok team.
+ * Copyright © 2013 Tox project.
+ */
+
 /* DHT test
  * A file with a main that runs our DHT for testing.
  *
@@ -8,26 +13,6 @@
  *
  * The test will then ask you for the id (in hex format) of the friend you wish to add
  */
-
-/*
- * Copyright © 2016-2018 The TokTok team.
- * Copyright © 2013 Tox project.
- *
- * This file is part of Tox, the free peer to peer instant messenger.
- *
- * Tox 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 3 of the License, or
- * (at your option) any later version.
- *
- * Tox 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 Tox.  If not, see <http://www.gnu.org/licenses/>.
- */
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index a61d0dcf..8ac8db67 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -1,3 +1,8 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2016-2018 The TokTok team.
+ * Copyright © 2013 Tox project.
+ */
+
 /* Messenger test
  *
  * This program adds a friend and accepts all friend requests with the proper message.
@@ -18,26 +23,6 @@
  *
  * EX: ./test Save.bak
  */
-
-/*
- * Copyright © 2016-2018 The TokTok team.
- * Copyright © 2013 Tox project.
- *
- * This file is part of Tox, the free peer to peer instant messenger.
- *
- * Tox 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 3 of the License, or
- * (at your option) any later version.
- *
- * Tox 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 Tox.  If not, see <http://www.gnu.org/licenses/>.
- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 22fa0d0c..8ab23db9 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -1,25 +1,10 @@
-/*
- * Miscellaneous functions and data structures for doing random things.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2016-2018 The TokTok team.
+ * Copyright © 2013 Tox project.
  */
 
 /*
- * Copyright © 2016-2018 The TokTok team.
- * Copyright © 2013 Tox project.
- *
- * This file is part of Tox, the free peer to peer instant messenger.
- *
- * Tox 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 3 of the License, or
- * (at your option) any later version.
- *
- * Tox 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 Tox.  If not, see <http://www.gnu.org/licenses/>.
+ * Miscellaneous functions and data structures for doing random things.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"