diff common/listutil.h @ 310:f758460ca437

Merged
author Sascha Wilde <wilde@intevation.de>
date Fri, 04 Apr 2014 09:54:19 +0200
parents 881ce5126f07
children 17e1c8f37d72
line wrap: on
line diff
--- a/common/listutil.h	Fri Apr 04 09:53:55 2014 +0200
+++ b/common/listutil.h	Fri Apr 04 09:54:19 2014 +0200
@@ -59,9 +59,9 @@
  */
 int verify_list(const char *data, const size_t size);
 
-/** @brief get a list of the certificates marked with I:
+/** @brief get a list of the certificates marked with I: or R:
  *
- * Get a list of certificates that should be installed by the
+ * Get a list of certificates that are contained in the
  * certificatelist pointed to by data.
  * On Success this function makes a copy of the certificates
  * and the certificates need to be freed by the caller.
@@ -72,23 +72,7 @@
  * @returns a newly allocated array of strings containing the encoded
  * certificates or NULL on error.
  * */
-char **get_certs_to_install(const char *data, const size_t size);
-
-/** @brief get a list of the certificates marked with R:
- *
- * Get a list of certificates that should be removed by the
- * certificatelist pointed to by data.
- * On Success this function makes a copy of the certificates
- * and the certificates need to be freed by the caller.
- *
- * @param [in] data the certificatelist to parse
- * @param [in] size the size of the certificatelist
- *
- * @returns a newly allocated array of strings containing the encoded
- * certificates or NULL on error.
- * */
-char **get_certs_to_remove(const char *data, const size_t size);
-
+char **get_certs_from_list (char *data, const size_t size);
 
 #ifdef __cplusplus
 }

http://wald.intevation.org/projects/trustbridge/