Add a prefix to the global visible tnc names to avoid name clashes, move to tncifimv

src/libcharon/tnc/tncifimv.c

@@ -14,18 +14,19 @@
  */
 
 #include "tncifimv.h"
-#include "tncifimv_names.h"
 
-ENUM(action_recommendation_names, TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
-								  TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION,
+ENUM(TNC_IMV_Action_Recommendation_names,
+	TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
+	TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION,
 	"allow",
 	"no access",
 	"isolate",
 	"no recommendation"
 );
 
-ENUM(evaluation_result_names, TNC_IMV_EVALUATION_RESULT_COMPLIANT,
-							  TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
+ENUM(TNC_IMV_Evaluation_Result_names,
+	TNC_IMV_EVALUATION_RESULT_COMPLIANT,
+	TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
 	"compliant",
 	"non-compliant minor",
 	"non-compliant major",

src/libcharon/tnc/tncifimv.h

@@ -52,6 +52,8 @@
 
 #include "tncif.h"
 
+#include <library.h>
+
 typedef TNC_UInt32 TNC_IMVID;
 typedef TNC_UInt32 TNC_IMV_Action_Recommendation;
 typedef TNC_UInt32 TNC_IMV_Evaluation_Result;
@@ -146,6 +148,8 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
 #define TNC_IMV_ACTION_RECOMMENDATION_ISOLATE 2
 #define TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION 3
 
+extern enum_name_t *TNC_IMV_Action_Recommendation_names;
+
 /* IMV Evaluation Result Values */
 
 #define TNC_IMV_EVALUATION_RESULT_COMPLIANT 0
@@ -154,6 +158,8 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
 #define TNC_IMV_EVALUATION_RESULT_ERROR 3
 #define TNC_IMV_EVALUATION_RESULT_DONT_KNOW 4
 
+extern enum_name_t *TNC_IMV_Evaluation_Result_names;
+
 /* Message Attribute ID Values */
 
 #define TNC_ATTRIBUTEID_PREFERRED_LANGUAGE ((TNC_AttributeID) 0x00000001)

src/libcharon/tnc/tncifimv_names.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 Andreas Steffen
- * HSR Hochschule fuer Technik Rapperswil
- *
- * 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.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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.
- */
-
-/**
- * @defgroup tncifimv_names tncifimv_names
- * @{ @ingroup tnc
- */
-
-#ifndef TNCIFIMV_NAMES_H_
-#define TNCIFIMV_NAMES_H_
-
-#include <library.h>
-
-extern enum_name_t *action_recommendation_names;
-extern enum_name_t *evaluation_result_names;
-
-#endif /** TNCIFIMV_NAMES_H_ @}*/