From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 3 Aug 2009 09:47:18 +0000 (+0200)
Subject: Resolve merge conflicts
X-Git-Tag: SQUID_3_2_0_1~819^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a80b46e31765e87a385559489989eb96ead4ace1;p=thirdparty%2Fsquid.git

Resolve merge conflicts
---

diff --git a/src/helper.cc b/src/helper.cc
index a0a1288da7..c8284ae100 100644
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -63,6 +63,7 @@ static void helperStatefulKickQueue(statefulhelper * hlp);
 static void helperRequestFree(helper_request * r);
 static void helperStatefulRequestFree(helper_stateful_request * r);
 static void StatefulEnqueue(statefulhelper * hlp, helper_stateful_request * r);
+static void helperStatefulServerKickQueue(helper_stateful_server * srv);
 static bool helperStartStats(StoreEntry *sentry, void *hlp, const char *label);
 
 
@@ -346,8 +347,8 @@ helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPSCB * callback, v
 
     if ((buf != NULL) && lastserver) {
         debugs(84, 5, "StatefulSubmit with lastserver " << lastserver);
-	assert(lastserver->flags.reserved == S_HELPER_RESERVED;
-        asser(!(lastserver->request));
+        assert(lastserver->flags.reserved == S_HELPER_RESERVED);
+        assert(!(lastserver->request));
 
         debugs(84, 5, "StatefulSubmit dispatching");
         helperStatefulDispatch(lastserver, r);
@@ -1027,8 +1028,8 @@ helperStatefulHandleRead(int fd, char *buf, size_t len, comm_err_t flag, int xer
 
             case S_HELPER_RESERVE:	/* 'pin' this helper for the caller */
 
-		srv->flags.reserved = S_HELPER_RESERVED;
-		debugs(84, 5, "StatefulHandleRead: reserving " << hlp->id_name << " #" << srv->index + 1);
+        	srv->flags.reserved = S_HELPER_RESERVED;
+        	debugs(84, 5, "StatefulHandleRead: reserving " << hlp->id_name << " #" << srv->index + 1);
 
                 break;
 
@@ -1379,8 +1380,6 @@ helperStatefulKickQueue(statefulhelper * hlp)
 static void
 helperStatefulServerKickQueue(helper_stateful_server * srv)
 {
-    helper_stateful_request *r;
-
     if (!srv->flags.shutdown) {
         helperStatefulKickQueue(srv->parent);
     } else if (!srv->flags.closing && srv->flags.reserved == S_HELPER_FREE && !srv->flags.busy) {