--------------------- PatchSet 4391 Date: 2007/04/25 22:01:09 Author: rousskov Branch: squid3-icap Tag: (none) Log: Assign cbdataReference result to avoid compiler warnings. Members: src/ICAP/AsyncJob.cc:1.1.2.1->1.1.2.2 src/ICAP/ICAPInitiator.cc:1.1.2.3->1.1.2.4 Index: squid3/src/ICAP/AsyncJob.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/Attic/AsyncJob.cc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/src/ICAP/AsyncJob.cc 25 Apr 2007 21:23:47 -0000 1.1.2.1 +++ squid3/src/ICAP/AsyncJob.cc 25 Apr 2007 22:01:09 -0000 1.1.2.2 @@ -10,7 +10,7 @@ AsyncJob *AsyncJob::AsyncStart(AsyncJob *job) { assert(job); - cbdataReference(job); // unlocked when done() in callEnd() + job = cbdataReference(job); // unlocked when done() in callEnd() AsyncCall(93,5, job, AsyncJob::noteStart); return job; } Index: squid3/src/ICAP/ICAPInitiator.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPInitiator.cc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/src/ICAP/ICAPInitiator.cc 25 Apr 2007 21:23:49 -0000 1.1.2.3 +++ squid3/src/ICAP/ICAPInitiator.cc 25 Apr 2007 22:01:09 -0000 1.1.2.4 @@ -7,7 +7,7 @@ #include "ICAPInitiator.h" ICAPInitiate *ICAPInitiator::initiateIcap(ICAPInitiate *x) { - cbdataReference(x); + x = cbdataReference(x); return dynamic_cast(ICAPInitiate::AsyncStart(x)); }