Re: HEAD broken after latest clientStreams merge - FIXED

Hi Robert,

Il 17.07 15/09/2002 Robert Collins ha scritto:
> > client_side_reply.c
> > C:\work\nt\src\client_side_reply.c(1314) : error C2039: 'sc' : is not a
> > member of '_clientHttpRequest'
> > C:\work\nt\src\structs.h(1064) : see declaration of
> > '_clientHttpRequest'
> > C:\work\nt\src\client_side_reply.c(1314) : warning C4047: 'function' :
> > 'struct _store_client *' differs in levels of indirection from
> 'unsigned int '
> > C:\work\nt\src\client_side_reply.c(1314) : warning C4024:
> > 'delaySetStoreClient' : different types for formal and actual parameter 1
> > C:\work\nt\src\client_side_reply.c(1314) : error C2198:
> > 'delaySetStoreClient' : too few actual parameters
> > C:\work\nt\src\client_side_reply.c(1318) : warning C4018: '==' :
> > signed/unsigned mismatch
> > C:\work\nt\src\client_side_reply.c(1361) : warning C4018: '<=' :
> > signed/unsigned mismatch
> > C:\work\nt\src\client_side_reply.c(1526) : warning C4018: '>' :
> > signed/unsigned mismatch
>
>I'm not sure on this one. What options are you building with?
>client_side_reply.c for me has a comment on line 1314.

Found the latest problem:

Index: src/client_side_reply.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side_reply.c,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 client_side_reply.c
--- src/client_side_reply.c 15 Sep 2002 14:12:12 -0000 1.2.2.1
+++ src/client_side_reply.c 15 Sep 2002 16:26:07 -0000
@@ -1311,7 +1324,7 @@ clientGetMoreData(clientStreamNode * thi
         }
         context->sc = storeClientListAdd(context->http->entry, context);
  #if DELAY_POOLS
- delaySetStoreClient(context->http->sc, delayClient(context->http));
+ delaySetStoreClient(context->sc, delayClient(context->http));
  #endif
         assert(context->http->logType == LOG_TCP_HIT);
         context->reqofs = 0;

Regards

Guido

-
=======================================================
Serassio Guido
Via Albenga, 11/4 10134 - Torino - ITALY
E-mail: guido.serassio@serassio.it
WWW: http://www.serassio.it
Received on Sun Sep 15 2002 - 10:29:07 MDT