Fixed doxygen groups in libcharon tnc subtree

src/libcharon/tnc/imc/imc.h

@@ -15,7 +15,10 @@
 
 /**
  * @defgroup imc imc
- * @{ @ingroup libcharon
+ * @ingroup tnc
+ *
+ * @defgroup imct imc
+ * @{ @ingroup imc
  */
 
 #ifndef IMC_H_

src/libcharon/tnc/imv/imv.h

@@ -15,7 +15,10 @@
 
 /**
  * @defgroup imv imv
- * @{ @ingroup libcharon
+ * @ingroup tnc
+ *
+ * @defgroup imvt imv
+ * @{ @ingroup imv
  */
 
 #ifndef IMV_H_

src/libcharon/tnc/imv/imv_recommendations.h

@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imv_recommendations imv_recommendations
- * @{ @ingroup libcharon
+ * @{ @ingroup imv
  */
 
 #ifndef IMV_RECOMMENDATIONS_H_

src/libcharon/tnc/tnccs/tnccs.h

@@ -15,7 +15,10 @@
 
 /**
  * @defgroup tnccs tnccs
- * @{ @ingroup libcharon
+ * @ingroup tnc
+ *
+ * @defgroup tnccst tnccs
+ * @{ @ingroup tnccs
  */
 
 #ifndef TNCCS_H_

src/libcharon/tnc/tncif.h

@@ -47,11 +47,17 @@
  * extracted from tncifimc.h and tncifimv.h
  * Feb 12, 2007
  */
-#ifndef _TNCIF_H
+
-#define _TNCIF_H
+/**
-#ifdef __cplusplus
+ * @defgroup tnc tnc
-extern "C" {
+ * @ingroup libcharon
-#endif
+ *
+ * @defgroup tncif tncif
+ * @{ @ingroup tnc
+ */
+
+#ifndef TNCIF_H_
+#define TNCIF_H_
 
 /* Basic Types */
 typedef unsigned long TNC_UInt32;
@@ -97,7 +103,4 @@ typedef TNC_UInt32 TNC_Result;
 /* Message Subtype Values */
 #define TNC_SUBTYPE_ANY ((TNC_MessageSubtype) 0xff)
 
-#ifdef __cplusplus
+#endif /** TNCIF_H_ @}*/
-}
-#endif
-#endif

src/libcharon/tnc/tncifimc.h

@@ -43,22 +43,13 @@
  *
  */
 
-#ifndef _TNCIFIMC_H
+/**
-#define _TNCIFIMC_H
+ * @defgroup tncifimc tncifimc
+ * @{ @ingroup tnc
+ */
 
-#ifdef __cplusplus
+#ifndef TNCIFIMC_H_
-extern "C" {
+#define TNCIFIMC_H_
-#endif
-
-#ifdef WIN32
-#ifdef TNC_IMC_EXPORTS
-#define TNC_IMC_API __declspec(dllexport)
-#else
-#define TNC_IMC_API __declspec(dllimport)
-#endif
-#else
-#define TNC_IMC_API
-#endif
 
 #include "tncif.h"
 
@@ -129,36 +120,36 @@ typedef TNC_Result (*TNC_IMC_ProvideBindFunctionPointer)(
 
 /* IMC Functions */
 
-TNC_IMC_API TNC_Result TNC_IMC_Initialize(
+TNC_Result TNC_IMC_Initialize(
 /*in*/  TNC_IMCID imcID,
 /*in*/  TNC_Version minVersion,
 /*in*/  TNC_Version maxVersion,
 /*out*/ TNC_Version *pOutActualVersion);
 
-TNC_IMC_API TNC_Result TNC_IMC_NotifyConnectionChange(
+TNC_Result TNC_IMC_NotifyConnectionChange(
 /*in*/  TNC_IMCID imcID,
 /*in*/  TNC_ConnectionID connectionID,
 /*in*/  TNC_ConnectionState newState);
 
-TNC_IMC_API TNC_Result TNC_IMC_BeginHandshake(
+TNC_Result TNC_IMC_BeginHandshake(
 /*in*/  TNC_IMCID imcID,
 /*in*/  TNC_ConnectionID connectionID);
 
-TNC_IMC_API TNC_Result TNC_IMC_ReceiveMessage(
+TNC_Result TNC_IMC_ReceiveMessage(
 /*in*/  TNC_IMCID imcID,
 /*in*/  TNC_ConnectionID connectionID,
 /*in*/  TNC_BufferReference messageBuffer,
 /*in*/  TNC_UInt32 messageLength,
 /*in*/  TNC_MessageType messageType);
 
-TNC_IMC_API TNC_Result TNC_IMC_BatchEnding(
+TNC_Result TNC_IMC_BatchEnding(
 /*in*/  TNC_IMCID imcID,
 /*in*/  TNC_ConnectionID connectionID);
 
-TNC_IMC_API TNC_Result TNC_IMC_Terminate(
+TNC_Result TNC_IMC_Terminate(
 /*in*/  TNC_IMCID imcID);
 
-TNC_IMC_API TNC_Result TNC_IMC_ProvideBindFunction(
+TNC_Result TNC_IMC_ProvideBindFunction(
 /*in*/  TNC_IMCID imcID,
 /*in*/  TNC_TNCC_BindFunctionPointer bindFunction);
 
@@ -186,8 +177,4 @@ TNC_Result TNC_TNCC_BindFunction(
 /*in*/  char *functionName,
 /*out*/ void **pOutfunctionPointer);
 
-#ifdef __cplusplus
+#endif /** TNCIFIMC_H_ @}*/
-}
-#endif
-
-#endif

src/libcharon/tnc/tncifimv.h

@@ -42,22 +42,13 @@
  * respective owners.
  */
 
-#ifndef _TNCIFIMV_H
+/**
-#define _TNCIFIMV_H
+ * @defgroup tncifimv tncifimv
+ * @{ @ingroup tnc
+ */
 
-#ifdef __cplusplus
+#ifndef TNCIFIMV_H_
-extern "C" {
+#define TNCIFIMV_H_
-#endif
-
-#ifdef WIN32
-#ifdef TNC_IMV_EXPORTS
-#define TNC_IMV_API __declspec(dllexport)
-#else
-#define TNC_IMV_API __declspec(dllimport)
-#endif
-#else
-#define TNC_IMV_API
-#endif
 
 #include "tncif.h"
 
@@ -171,36 +162,36 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
 
 /* IMV Functions */
 
-TNC_IMV_API TNC_Result TNC_IMV_Initialize(
+TNC_Result TNC_IMV_Initialize(
 /*in*/  TNC_IMVID imvID,
 /*in*/  TNC_Version minVersion,
 /*in*/  TNC_Version maxVersion,
 /*in*/  TNC_Version *pOutActualVersion);
 
-TNC_IMV_API TNC_Result TNC_IMV_NotifyConnectionChange(
+TNC_Result TNC_IMV_NotifyConnectionChange(
 /*in*/  TNC_IMVID imvID,
 /*in*/  TNC_ConnectionID connectionID,
 /*in*/  TNC_ConnectionState newState);
 
-TNC_IMV_API TNC_Result TNC_IMV_ReceiveMessage(
+TNC_Result TNC_IMV_ReceiveMessage(
 /*in*/  TNC_IMVID imvID,
 /*in*/  TNC_ConnectionID connectionID,
 /*in*/  TNC_BufferReference messageBuffer,
 /*in*/  TNC_UInt32 messageLength,
 /*in*/  TNC_MessageType messageType);
 
-TNC_IMV_API TNC_Result TNC_IMV_SolicitRecommendation(
+TNC_Result TNC_IMV_SolicitRecommendation(
 /*in*/  TNC_IMVID imvID,
 /*in*/  TNC_ConnectionID connectionID);
 
-TNC_IMV_API TNC_Result TNC_IMV_BatchEnding(
+TNC_Result TNC_IMV_BatchEnding(
 /*in*/  TNC_IMVID imvID,
 /*in*/  TNC_ConnectionID connectionID);
 
-TNC_IMV_API TNC_Result TNC_IMV_Terminate(
+TNC_Result TNC_IMV_Terminate(
 /*in*/  TNC_IMVID imvID);
 
-TNC_IMV_API TNC_Result TNC_IMV_ProvideBindFunction(
+TNC_Result TNC_IMV_ProvideBindFunction(
 /*in*/  TNC_IMVID imvID,
 /*in*/  TNC_TNCS_BindFunctionPointer bindFunction);
 
@@ -249,8 +240,4 @@ TNC_Result TNC_TNCS_BindFunction(
 /*in*/  char *functionName,
 /*in*/  void **pOutfunctionPointer);
 
-#ifdef __cplusplus
+#endif /** TNCIFIMV_H_ @}*/
-}
-#endif
-
-#endif

src/libcharon/tnc/tncifimv_names.h

@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tncifimv_names tncifimv_names
- * @{ @ingroup libcharon
+ * @{ @ingroup tnc
  */
 
 #ifndef TNCIFIMV_NAMES_H_