Attempt merging from 6.3.24.

[~andy/fetchmail] / uid_db.c

diff --git a/uid_db.c b/uid_db.c
index 7336a00e6ce1ca6c5b9ebd2deb2acab315e404d5..14a081d8299b1262657bb6063942f9dab0e354eb 100644 (file)
--- a/uid_db.c
+++ b/uid_db.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>  // ffs() lives here
 
 #include "xmalloc.h"
 #include "uid_db.h"
@@ -204,6 +205,7 @@ static struct pat_node *get_standalone_node(struct uid_db_record *rec)
 }
 
 /***  various helpers */
+#if 0
 static inline int record_id_equal(struct uid_db_record const *r0,
                                  struct uid_db_record const *r1)
 {
@@ -211,6 +213,7 @@ static inline int record_id_equal(struct uid_db_record const *r0,
        r0->id_len == r1->id_len
        && memcmp(r0->id, r1->id, r0->id_len) == 0;
 }
+#endif
 
 static struct uid_db_record *append_to_list(struct uid_db_record **recp,
                                            struct uid_db_record *rec)
@@ -457,6 +460,8 @@ struct uid_db_record *last_uid_in_db(struct uid_db *db, char const *id)
 /**  destruction */
 static void free_uid_list(struct uid_db_record *rec)
 {
+    if (!rec) return;
+
     /*
       Free the list of uid_db_records starting with
       the record pointed to by rec.