* src/ipaddr.* : fixes

src/ipaddr.c

@@ -30,6 +30,14 @@ f2b_ipaddr_create(const char *addr, size_t matches) {
   return NULL;
 }
 
+void
+f2b_ipaddr_destroy(f2b_ipaddr_t *ipaddr) {
+  assert(ipaddr != NULL);
+
+  f2b_matches_destroy(&ipaddr->matches);
+  free(ipaddr);
+}
+
 f2b_ipaddr_t *
 f2b_addrlist_append(f2b_ipaddr_t *list, f2b_ipaddr_t *ipaddr) {
   assert(ipaddr != NULL);
@@ -40,15 +48,38 @@ f2b_addrlist_append(f2b_ipaddr_t *list, f2b_ipaddr_t *ipaddr) {
 
 f2b_ipaddr_t *
 f2b_addrlist_lookup(f2b_ipaddr_t *list, const char *addr) {
+
   assert(addr != NULL);
 
   if (list == NULL)
     return NULL;
 
-  for (f2b_ipaddr_t *a = list; a->next != NULL; a = a->next) {
+  for (f2b_ipaddr_t *a = list; a != NULL; a = a->next) {
     if (strncmp(a->text, addr, sizeof(a->text)) == 0)
       return a;
   }
 
   return NULL;
 }
+
+f2b_ipaddr_t *
+f2b_addrlist_remove(f2b_ipaddr_t *list, const char *addr) {
+  f2b_ipaddr_t *a = NULL;
+
+  assert(addr != NULL);
+
+  if (list == NULL)
+    return NULL;
+
+  if (strncmp(list->text, addr, sizeof(list->text)) == 0) {
+    a = list->next;
+    f2b_ipaddr_destroy(list);
+    return a;
+  }
+
+  for (a = list; a->next != NULL; a = a->next) {
+    assert(0); /* TODO */
+  }
+
+  return list;
+}

src/ipaddr.h

@@ -17,7 +17,10 @@ typedef struct f2b_ipaddr_t {
 } f2b_ipaddr_t;
 
 f2b_ipaddr_t * f2b_ipaddr_create (const char *addr, size_t max_matches);
+void           f2b_ipaddr_destroy(f2b_ipaddr_t *ipaddr);
+
 f2b_ipaddr_t * f2b_addrlist_append(f2b_ipaddr_t *list, f2b_ipaddr_t *ipaddr);
 f2b_ipaddr_t * f2b_addrlist_lookup(f2b_ipaddr_t *list, const char *addr);
+f2b_ipaddr_t * f2b_addrlist_remove(f2b_ipaddr_t *list, const char *addr);
 
 #endif /* F2B_IPADDR_H_ */