gline_comparator(const void *a, const void *b)
{
const struct gline *ga=a, *gb=b;
- return ga->expires - gb->expires;
+ return ga->lifetime - gb->lifetime;
}
static void
}
static int
-gline_for_p(UNUSED_ARG(void *key), void *data, void *extra)
+gline_equal_p(UNUSED_ARG(void *key), void *data, void *extra)
{
- struct gline *ge = data;
- return !irccasecmp(ge->target, extra);
+ return data == extra;
}
static void
lifetime = expires;
ent = dict_find(gline_dict, target, NULL);
if (ent) {
- heap_remove_pred(gline_heap, gline_for_p, (char*)target);
- if (ent->expires != expires)
- ent->expires = expires;
+ heap_remove_pred(gline_heap, gline_equal_p, ent);
+ if (ent->issued > lastmod)
+ ent->issued = lastmod;
+ if (ent->lastmod < lastmod) {
+ ent->lastmod = lastmod;
+ ent->expires = expires;
+ if (strcmp(ent->reason, reason)) {
+ free(ent->reason);
+ ent->reason = strdup(reason);
+ }
+ }
if (ent->lifetime < lifetime)
ent->lifetime = lifetime;
- if (ent->lastmod < lastmod)
- ent->lastmod = lastmod;
- if (strcmp(ent->issuer, issuer)) {
- free(ent->issuer);
- ent->issuer = strdup(issuer);
- }
- if (strcmp(ent->reason, reason)) {
- free(ent->reason);
- ent->reason = strdup(reason);
- }
} else {
ent = malloc(sizeof(*ent));
ent->issued = issued;