merged the modularization branch (credentials) back to trunk

1 files changed, 14 insertions, 30 deletions

diff --git a/src/charon/encoding/payloads/delete_payload.h b/src/charon/encoding/payloads/delete_payload.h
index 508f7fba2..150a87470 100644
--- a/src/charon/encoding/payloads/delete_payload.h
+++ b/src/charon/encoding/payloads/delete_payload.h
@@ -1,10 +1,3 @@
-/**
- * @file delete_payload.h
- * 
- * @brief Interface of delete_payload_t.
- * 
- */
-
 /*
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
@@ -19,6 +12,13 @@
  * 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.
+ *
+ * $Id$
+ */
+
+/**
+ * @defgroup delete_payload delete_payload
+ * @{ @ingroup payloads
  */
 
 #ifndef DELETE_PAYLOAD_H_
@@ -32,22 +32,13 @@ typedef struct delete_payload_t delete_payload_t;
 
 /**
  * Length of a delete payload without the SPI in bytes.
- *
- * @ingroup payloads
  */
 #define DELETE_PAYLOAD_HEADER_LENGTH 8
 
 /**
- * @brief Class representing an IKEv2 DELETE payload.
+ * Class representing an IKEv2 DELETE payload.
  *
  * The DELETE payload format is described in RFC section 3.11.
- *
- * @b Constructors:
- * - delete_payload_create()
- *
- * @todo Implement better setter/getters
- *
- * @ingroup payloads
  */
 struct delete_payload_t {
 	/**
@@ -56,47 +47,40 @@ struct delete_payload_t {
 	payload_t payload_interface;
 	
 	/**
-	 * @brief Get the protocol ID.
+	 * Get the protocol ID.
 	 *
-	 * @param this 			calling delete_payload_t object
 	 * @return				protocol ID
 	 */
 	protocol_id_t (*get_protocol_id) (delete_payload_t *this);
 	
 	/**
-	 * @brief Add an SPI to the list of deleted SAs.
+	 * Add an SPI to the list of deleted SAs.
 	 *
-	 * @param this 			calling delete_payload_t object
 	 * @param spi			spi to add
 	 */
 	void (*add_spi) (delete_payload_t *this, u_int32_t spi);
 	
 	/**
-	 * @brief Get an iterator over the SPIs.
+	 * Get an iterator over the SPIs.
 	 *
 	 * The iterate() function returns a pointer to a u_int32_t SPI.
 	 *
-	 * @param this 			calling delete_payload_t object
 	 * @return				iterator over SPIs
 	 */
 	iterator_t *(*create_spi_iterator) (delete_payload_t *this);
 	
 	/**
-	 * @brief Destroys an delete_payload_t object.
-	 *
-	 * @param this 	delete_payload_t object to destroy
+	 * Destroys an delete_payload_t object.
 	 */
 	void (*destroy) (delete_payload_t *this);
 };
 
 /**
- * @brief Creates an empty delete_payload_t object.
+ * Creates an empty delete_payload_t object.
  * 
  * @param protocol_id	protocol, such as AH|ESP
  * @return 				delete_payload_t object
- * 
- * @ingroup payloads
  */
 delete_payload_t *delete_payload_create(protocol_id_t protocol_id);
 
-#endif /* DELETE_PAYLOAD_H_ */
+#endif /* DELETE_PAYLOAD_H_ @} */