Further code cleanup

Added in addition missing GPLv2 only remarks where it was missing
from commit 0712bce6f387121e37501ec323e3da89ce4300c3

9 files changed, 16 insertions, 43 deletions

diff --git a/eurephiadm/CMakeLists.txt b/eurephiadm/CMakeLists.txt
index 8b525cb..b6922cb 100644
--- a/eurephiadm/CMakeLists.txt
+++ b/eurephiadm/CMakeLists.txt
@@ -5,7 +5,6 @@ SET(efw_ipt_SRC
         eurephiadm.c
         argparser.c
         get_console_input.c
-        field_print.c
         client_config.c
         client_context.c
         client_session.c
diff --git a/eurephiadm/commands.h b/eurephiadm/commands.h
index 5c48951..3ede299 100644
--- a/eurephiadm/commands.h
+++ b/eurephiadm/commands.h
@@ -2,7 +2,7 @@
  *                 The function is found in the ./commands dir
  *                 where each command have their own file
  *
- *  GPLv2      - Copyright (C) 2008, 2009
+ *  GPLv2 only - Copyright (C) 2008, 2009
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/eurephiadm/eurephiadm.c b/eurephiadm/eurephiadm.c
index b04fb54..11f3e84 100644
--- a/eurephiadm/eurephiadm.c
+++ b/eurephiadm/eurephiadm.c
@@ -1,6 +1,6 @@
 /* eurephiadm.c  --  CLI based admin program for eurephia
  *
- *  GPLv2      - Copyright (C) 2008, 2009
+ *  GPLv2 only - Copyright (C) 2008, 2009
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/eurephiadm/field_print.c b/eurephiadm/field_print.c
deleted file mode 100644
index 454b6f6..0000000
--- a/eurephiadm/field_print.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* field_print.c  --  simple functions for printing label/value pairs
- *
- *  GPLv2      - Copyright (C) 2008
- *               David Sommerseth <dazo@users.sourceforge.net>
- *
- *  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; version 2
- *  of the License.
- *
- *  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.
- *
- */
-
-#include <stdio.h>
-
-inline void field_print_int(char *label, int val) {
-        printf("%25.25s: %i\n", label, val);
-}
-
-inline void field_print_str(char *label, char *val) {
-        printf("%25.25s: %s\n", label, (val == NULL ? "-" : val));
-}
-
diff --git a/eurephiadm/field_print.h b/eurephiadm/field_print.h
index 7d92293..09743f0 100644
--- a/eurephiadm/field_print.h
+++ b/eurephiadm/field_print.h
@@ -1,6 +1,6 @@
 /* field_print.h  --  simple functions for printing label/value pairs
  *
- *  GPLv2      - Copyright (C) 2008
+ *  GPLv2 only - Copyright (C) 2008, 2009
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
@@ -24,7 +24,12 @@
 #ifndef FIELD_PRINT_H
 #define FIELD_PRINT_H
 
-inline void field_print_int(char *label, int val);
-inline void field_print_str(char *label, char *val);
+inline static void field_print_int(char *label, int val) {
+        printf("%25.25s: %i\n", label, val);
+}
+
+inline static void field_print_str(char *label, char *val) {
+        printf("%25.25s: %s\n", label, (val == NULL ? "-" : val));
+}
 
 #endif
diff --git a/eurephiadm/get_console_input.c b/eurephiadm/get_console_input.c
index dc5faec..c64cefd 100644
--- a/eurephiadm/get_console_input.c
+++ b/eurephiadm/get_console_input.c
@@ -1,6 +1,6 @@
-/* getpassword.c  --  Get password via console
+/* get_console_input.c -- function to simplify TTY input
  *
- *  GPLv2      - Copyright (C) 2008
+ *  GPLv2 only - Copyright (C) 2008
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/eurephiadm/get_console_input.h b/eurephiadm/get_console_input.h
index 9ef649f..12120ab 100644
--- a/eurephiadm/get_console_input.h
+++ b/eurephiadm/get_console_input.h
@@ -1,6 +1,6 @@
 /* get_console_input.h  --  Get input from console
  *
- *  GPLv2      - Copyright (C) 2008
+ *  GPLv2 only - Copyright (C) 2008
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/eurephiadm/parse_certificate_files.c b/eurephiadm/parse_certificate_files.c
index 9e8043b..de8f9d4 100644
--- a/eurephiadm/parse_certificate_files.c
+++ b/eurephiadm/parse_certificate_files.c
@@ -1,6 +1,6 @@
 /* parse_certificate_files.c  --  Parses PEM or PKCS12 formated cert. files
  *
- *  GPLv2      - Copyright (C) 2008, 2009
+ *  GPLv2 only - Copyright (C) 2008, 2009
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/eurephiadm/parse_certificate_files.h b/eurephiadm/parse_certificate_files.h
index 81a7a8b..8ae7802 100644
--- a/eurephiadm/parse_certificate_files.h
+++ b/eurephiadm/parse_certificate_files.h
@@ -1,6 +1,6 @@
-/* parse_certificate_files.h  --  
+/* parse_certificate_files.c  --  Parses PEM or PKCS12 formated cert. files
  *
- *  GPLv2      - Copyright (C) 2008
+ *  GPLv2 only - Copyright (C) 2008
  *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or