From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 7 Jan 2011 06:18:42 +0000 (+0100)
Subject: corrected naming of tnccs_reason_strings_msg_t object
X-Git-Tag: 4.5.1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a04dfaaf695d18c256181bc3339c329ec563519;p=thirdparty%2Fstrongswan.git

corrected naming of tnccs_reason_strings_msg_t object
---

diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c
index d04ca80c45..884cd14242 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c
@@ -17,17 +17,17 @@
 
 #include <debug.h>
 
-typedef struct private_tnccs_reason_strings_t private_tnccs_reason_strings_t;
+typedef struct private_tnccs_reason_strings_msg_t private_tnccs_reason_strings_msg_t;
 
 /**
- * Private data of a tnccs_reason_strings_t object.
+ * Private data of a tnccs_reason_strings_msg_t object.
  *
  */
-struct private_tnccs_reason_strings_t {
+struct private_tnccs_reason_strings_msg_t {
 	/**
-	 * Public tnccs_reason_strings_t interface.
+	 * Public tnccs_reason_strings_msg_t interface.
 	 */
-	tnccs_reason_strings_t public;
+	tnccs_reason_strings_msg_t public;
 
 	/**
 	 * TNCCS message type
@@ -51,27 +51,27 @@ struct private_tnccs_reason_strings_t {
 };
 
 METHOD(tnccs_msg_t, get_type, tnccs_msg_type_t,
-	private_tnccs_reason_strings_t *this)
+	private_tnccs_reason_strings_msg_t *this)
 {
 	return this->type;
 }
 
 METHOD(tnccs_msg_t, get_node, xmlNodePtr,
-	private_tnccs_reason_strings_t *this)
+	private_tnccs_reason_strings_msg_t *this)
 {
 	return this->node;
 }
 
 METHOD(tnccs_msg_t, destroy, void,
-	private_tnccs_reason_strings_t *this)
+	private_tnccs_reason_strings_msg_t *this)
 {
 	free(this->language);
 	free(this->reason);
 	free(this);
 }
 
-METHOD(tnccs_reason_strings_t, get_reason, char*,
-	private_tnccs_reason_strings_t *this, char **language)
+METHOD(tnccs_reason_strings_msg_t, get_reason, char*,
+	private_tnccs_reason_strings_msg_t *this, char **language)
 {
 	*language = this->language;
 
@@ -81,9 +81,9 @@ METHOD(tnccs_reason_strings_t, get_reason, char*,
 /**
  * See header
  */
-tnccs_msg_t *tnccs_reason_strings_create_from_node(xmlNodePtr node)
+tnccs_msg_t *tnccs_reason_strings_msg_create_from_node(xmlNodePtr node)
 {
-	private_tnccs_reason_strings_t *this;
+	private_tnccs_reason_strings_msg_t *this;
 
 	INIT(this,
 		.public = {
@@ -104,9 +104,9 @@ tnccs_msg_t *tnccs_reason_strings_create_from_node(xmlNodePtr node)
 /**
  * See header
  */
-tnccs_msg_t *tnccs_reason_strings_create(char *language, char *reason)
+tnccs_msg_t *tnccs_reason_strings_msg_create(char *language, char *reason)
 {
-	private_tnccs_reason_strings_t *this;
+	private_tnccs_reason_strings_msg_t *this;
 	xmlNodePtr n, n2, n3;
 
 	INIT(this,
diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h
index c203a8e785..0b68c2c13b 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h
@@ -14,21 +14,21 @@
  */
 
 /**
- * @defgroup tnccs_reason_strings tnccs_reason_strings
+ * @defgroup tnccs_reason_strings_msg tnccs_reason_strings_msg
  * @{ @ingroup tnccs_11
  */
 
-#ifndef TNCCS_REASON_STRINGS_H_
-#define TNCCS_REASON_STRINGS_H_
+#ifndef TNCCS_REASON_STRINGS_MSG_H_
+#define TNCCS_REASON_STRINGS_MSG_H_
 
-typedef struct tnccs_reason_strings_t tnccs_reason_strings_t;
+typedef struct tnccs_reason_strings_msg_t tnccs_reason_strings_msg_t;
 
 #include "tnccs_msg.h"
 
 /**
  * Class representing the TNCCS-ReasonStrings message type
  */
-struct tnccs_reason_strings_t {
+struct tnccs_reason_strings_msg_t {
 
 	/**
 	 * TNCCS Message interface
@@ -41,7 +41,7 @@ struct tnccs_reason_strings_t {
 	 * @param language		reason language
 	 * @return				reason string
 	 */
-	char* (*get_reason)(tnccs_reason_strings_t *this, char **language);
+	char* (*get_reason)(tnccs_reason_strings_msg_t *this, char **language);
 };
 
 /**
@@ -49,7 +49,7 @@ struct tnccs_reason_strings_t {
  *
  * @param msg_node			XML-encoded message node
  */
-tnccs_msg_t *tnccs_reason_strings_create_from_node(xmlNodePtr node);
+tnccs_msg_t *tnccs_reason_strings_msg_create_from_node(xmlNodePtr node);
 
 /**
  * Create a TNCCS-ReasonStrings message from parameters
@@ -57,6 +57,6 @@ tnccs_msg_t *tnccs_reason_strings_create_from_node(xmlNodePtr node);
  * @param language			reason language
  * @param reason			reason string
  */
-tnccs_msg_t *tnccs_reason_strings_create(char *language, char *reason);
+tnccs_msg_t *tnccs_reason_strings_msg_create(char *language, char *reason);
 
-#endif /** TNCCS_REASON_STRINGS_H_ @}*/
+#endif /** TNCCS_REASON_STRINGS_MSG_H_ @}*/