Ensure DB4 backend dbconns memory is initialised to zero

[onak.git] / keyid.c

diff --git a/keyid.c b/keyid.c
index 5149fd640d7e552294aa17c19e17d72cc4db05cf..2bec710026f85a92fe4ce6f8547700d6b998f3c1 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -4,13 +4,10 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: keyid.c,v 1.10 2004/05/31 22:04:51 noodles Exp $

  */
 
 #include <sys/types.h>
 
  */
 
 #include <sys/types.h>
 

-#include "assert.h"

 #include "keyid.h"
 #include "keystructs.h"
 #include "log.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "log.h"


@@ -46,8 +43,8 @@ unsigned char *get_fingerprint(struct openpgp_packet *packet,
        unsigned char c;
        size_t         modlen, explen;
 
        unsigned char c;
        size_t         modlen, explen;
 

-       assert(fingerprint != NULL);
-       assert(len != NULL);
+       log_assert(fingerprint != NULL);
+       log_assert(len != NULL);

 
        *len = 0;
 
 
        *len = 0;
 


@@ -112,7 +109,7 @@ uint64_t get_packetid(struct openpgp_packet *packet)
        size_t          length = 0;
        unsigned char   buff[20];
 
        size_t          length = 0;
        unsigned char   buff[20];
 

-       assert(packet != NULL);
+       log_assert(packet != NULL);

 
        switch (packet->data[0]) {
        case 2:
 
        switch (packet->data[0]) {
        case 2: