X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..2563dc1f46fad1640e2472151a9f1cf918f841b9:/lib/eventlog.c

diff --git a/lib/eventlog.c b/lib/eventlog.c
index e652e22..9c7f4fb 100644
--- a/lib/eventlog.c
+++ b/lib/eventlog.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005 Richard Kettlewell
+ * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,12 +18,9 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "mem.h"
 #include "vector.h"
@@ -48,7 +45,7 @@ void eventlog_remove(struct eventlog_output *lo) {
 }
 
 static void veventlog(const char *keyword, const char *raw, va_list ap) {
-  struct eventlog_output *p;
+  struct eventlog_output *p, *pnext;
   struct dynstr d;
   const char *param;
 
@@ -63,8 +60,12 @@ static void veventlog(const char *keyword, const char *raw, va_list ap) {
     dynstr_append_string(&d, raw);
   }
   dynstr_terminate(&d);
-  for(p = outputs; p; p = p->next)
+  for(p = outputs; p; p = pnext) {
+    /* We must be able to cope with eventlog_remove() being called from inside
+     * the callback */
+    pnext = p->next;
     p->fn(d.vec, p->user);
+  }
 }
 
 void eventlog_raw(const char *keyword, const char *raw, ...) {