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.

diff --git a/parsekey.c b/parsekey.c
index fbdde15c1098139685f1eff305d822629e38cb23..a2ff57847e4cea077bfb8d8672a595d70cafa12a 100644 (file)
--- 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.
  *
  *     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 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
 
        /*
         * 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);
                        }
                        memset(curkey, 0, sizeof(*curkey));
                        curkey->publickey = packet_dup(packets->packet);

+                       count++;

                        break;
                case 13:
                case 17:
                        break;
                case 13:
                case 17:


@@ -126,7 +132,7 @@ int parse_keys(struct openpgp_packet_list *packets,
                packets = packets->next;
        }
 
                packets = packets->next;
        }
 

-       return 0;
+       return count;

 }
 
 /**
 }
 
 /**

diff --git a/parsekey.h b/parsekey.h
index 2bfaf728ea131ca7cb8766ada350b2ff0c9043b8..8b6f1cdc8b6ab930bb5dcfcb4e2861cb67334c0b 100644 (file)
--- 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.
  *
  *     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);
  */
 int parse_keys(struct openpgp_packet_list *packets,
                struct openpgp_publickey **keys);