Fix license headers.

There appears to have been a mishmash of GPLv2 and GPLv3 headers, so
this is fixed now.

7 files changed, 83 insertions, 76 deletions

diff --git a/halfkay.c b/halfkay.c
index 3f0aeec..2b69f9e 100644
--- a/halfkay.c
+++ b/halfkay.c
@@ -1,20 +1,21 @@
-/*  HalfKay implementation
- *  Based on Teensy Loader (cli) (http://www.pjrc.com/teensy/loader_cli.html)
+/*
+ * halfkay.c -- HalfKay protocol implementation
+ * Based on Teensy Loader (cli) (http://www.pjrc.com/teensy/loader_cli.html)
  *
- * Copyright (C) 2016  Tomasz Kramkowski <tk@the-tk.com>
+ * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.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 3 of the License, or
- *  (at your option) any later version.
+ * 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 3 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.
+ * 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, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _DEFAULT_SOURCE
diff --git a/halfkay.h b/halfkay.h
index baa34af..b7b6360 100644
--- a/halfkay.h
+++ b/halfkay.h
@@ -1,11 +1,12 @@
-/* HalfKay implementation
+/*
+ * halfkay.c -- HalfKay protocol implementation
  * Based on Teensy Loader (cli) (http://www.pjrc.com/teensy/loader_cli.html)
  *
  * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.com>
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,10 +14,10 @@
  * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef HALFKAY_H
 #define HALFKAY_H
 
diff --git a/hktool.c b/hktool.c
index 76e6b75..233f5c9 100644
--- a/hktool.c
+++ b/hktool.c
@@ -1,11 +1,12 @@
-/* HalfKay loader - Load binary data to HalfKay protocol based MCUs.
+/*
+ * HalfKay loader - Load binary data to HalfKay protocol based MCUs.
  * Based on Teensy Loader (cli) (http://www.pjrc.com/teensy/loader_cli.html)
  *
  * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.com>
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,10 +14,10 @@
  * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/params.c b/params.c
index 17bf91d..3fe324c 100644
--- a/params.c
+++ b/params.c
@@ -1,21 +1,22 @@
-/* params.c  --  Device parameter file handling.
+/*
+ * params.c -- Device parameter file handling.
  *
- *  Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.com>
+ * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.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 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.
  *
- *  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.
+ * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
diff --git a/params.h b/params.h
index 468af8c..069d4fd 100644
--- a/params.h
+++ b/params.h
@@ -1,21 +1,22 @@
-/*  params.c  --  Device parameter file handling.
+/*
+ * params.c -- Device parameter file handling.
  *
  * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.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 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.
  *
- *  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.
+ * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef PARAMS_H
 #define PARAMS_H
 
diff --git a/util.c b/util.c
index 33c5bee..4d67486 100644
--- a/util.c
+++ b/util.c
@@ -1,21 +1,22 @@
-/* util.c  -- Various error checking wrappers and utilities.
+/*
+ * util.c -- Various error checking wrappers and utilities.
  *
- *  Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.com>
+ * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.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 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.
  *
- *  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.
+ * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/util.h b/util.h
index d1f459a..348a557 100644
--- a/util.h
+++ b/util.h
@@ -1,21 +1,22 @@
-/* util.h  -- Various error checking wrappers and utilities.
+/*
+ * util.c -- Various error checking wrappers and utilities.
  *
- *  Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.com>
+ * Copyright (C) 2016 Tomasz Kramkowski <tk@the-tk.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 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.
  *
- *  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.
+ * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef UTIL_H
 #define UTIL_H