From d5ffc2f6e667c1d849bf7579add8435664e678c5 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 22 Dec 2007 17:10:37 +0000 Subject: [PATCH 1/1] Avoid mixed-stmt declare --- src/logic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/logic.c b/src/logic.c index c7314b2..a004da3 100644 --- a/src/logic.c +++ b/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.72 2007-11-09 10:43:58 adam Exp $ +/* $Id: logic.c,v 1.73 2007-12-22 17:10:37 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -554,9 +554,12 @@ void session_alert_watch(struct session *s, int what) if (s->watchlist[what].fun) { /* our watch is no longer associated with http_channel */ + void *data; + session_watchfun fun; + http_remove_observer(s->watchlist[what].obs); - session_watchfun fun = s->watchlist[what].fun; - void *data = s->watchlist[what].data; + fun = s->watchlist[what].fun; + data = s->watchlist[what].data; /* reset watch before fun is invoked - in case fun wants to set it again */ -- 1.7.10.4