From 8bb45b1dfe6b5b30d89f154c16fb3eb8c049f496 Mon Sep 17 00:00:00 2001
From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:47:17 +0000
Subject: [PATCH 1/1] cscvs to tla changeset 43 Author: noodles Date:
2002/11/22 18:54:37 Changed parse_keys to return a count of the number of
keys parsed.
---
parsekey.c | 8 +++++++-
parsekey.h | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/parsekey.c b/parsekey.c
index fbdde15..a2ff578 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -39,11 +39,16 @@ int add_key(struct openpgp_publickey *key) {
*
* This function takes an list of OpenPGP packets and attempts to parse it
* into a list of public keys with signatures and subkeys.
+ *
+ * Returns a count of how many keys we parsed.
*/
int parse_keys(struct openpgp_packet_list *packets,
struct openpgp_publickey **keys)
{
struct openpgp_publickey *curkey = NULL;
+ int count;
+
+ count = 0;
/*
* If keys already has some keys in it then set curkey to the last one
@@ -89,6 +94,7 @@ int parse_keys(struct openpgp_packet_list *packets,
}
memset(curkey, 0, sizeof(*curkey));
curkey->publickey = packet_dup(packets->packet);
+ count++;
break;
case 13:
case 17:
@@ -126,7 +132,7 @@ int parse_keys(struct openpgp_packet_list *packets,
packets = packets->next;
}
- return 0;
+ return count;
}
/**
diff --git a/parsekey.h b/parsekey.h
index 2bfaf72..8b6f1cd 100644
--- a/parsekey.h
+++ b/parsekey.h
@@ -30,6 +30,8 @@ int add_key(struct openpgp_publickey *key);
*
* This function takes an list of OpenPGP packets and attempts to parse it
* into a list of public keys with signatures and subkeys.
+ *
+ * Returns a count of how many keys we parsed.
*/
int parse_keys(struct openpgp_packet_list *packets,
struct openpgp_publickey **keys);
--
2.39.5