X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=sidebyside;f=merge.c;h=9d03411cde1f3a8eaba108b0fc51c917e152dde5;hb=16090beae045493943da0f51b1a36d7999036afd;hp=67144c28525842524b75da851a5cf4326dc48264;hpb=0c120d1895d25b59abe338862189be1b87447569;p=onak.git
diff --git a/merge.c b/merge.c
index 67144c2..9d03411 100644
--- a/merge.c
+++ b/merge.c
@@ -13,8 +13,7 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
#include
@@ -164,17 +163,15 @@ struct openpgp_signedpacket_list *find_signed_packet(
* removes it if found. Assumes the packet can only exist a maximum of
* once in the list.
*/
-bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
+static void remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
struct openpgp_signedpacket_list **list_end,
struct openpgp_packet *packet)
{
struct openpgp_signedpacket_list *cur = NULL;
struct openpgp_signedpacket_list *prev = NULL;
- bool found = false;
- for (cur = *packet_list; !found && (cur != NULL); cur = cur->next) {
+ for (cur = *packet_list; cur != NULL; cur = cur->next) {
if (compare_packets(cur->packet, packet) == 0) {
- found = true;
if (prev == NULL) {
*packet_list = cur->next;
} else {
@@ -183,14 +180,14 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
if (cur->next == NULL) {
*list_end = prev;
}
- /*
- * TODO: Free the removed signed packet...
- */
+ cur->next = NULL;
+ free_signedpacket_list(cur);
+ break;
}
prev = cur;
}
- return found;
+ return;
}
/**