Synchronize from trunk

[disorder] / lib / eventlog.c

diff --git a/lib/eventlog.c b/lib/eventlog.c
index b9ae495e00f68985c93f32cf39678548516d7d37..a56884b33d50b3874f3f537eca2b5daedbfb3b5a 100644 (file)
--- a/lib/eventlog.c
+++ b/lib/eventlog.c
@@ -1,29 +1,26 @@
 /*
  * 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <config.h>
-#include "types.h"
+/** @file lib/eventlog.c
+ * @brief Event logging
+ */
+#include "common.h"
 
 #include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "mem.h"
 #include "vector.h"
@@ -66,7 +63,7 @@ static void veventlog(const char *keyword, const char *raw, va_list ap) {
   for(p = outputs; p; p = pnext) {
     /* We must be able to cope with eventlog_remove() being called from inside
      * the callback */
-    pnext = p;
+    pnext = p->next;
     p->fn(d.vec, p->user);
   }
 }