[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-filesystem-cvs
Subject:    [Filesystem-cvs] http httpfsys.cpp,1.61,1.62
From:       ehodge () helixcommunity ! org
Date:       2004-11-24 18:48:53
[Download RAW message or body]

Update of /cvsroot/filesystem/http
In directory cvs-new:/tmp/cvs-serv1573

Modified Files:
	httpfsys.cpp 
Log Message:
+ Use renamed #define

Reviewed by:  bobclark@real.com


Index: httpfsys.cpp
===================================================================
RCS file: /cvsroot/filesystem/http/httpfsys.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- httpfsys.cpp	17 Nov 2004 20:42:36 -0000	1.61
+++ httpfsys.cpp	24 Nov 2004 18:48:51 -0000	1.62
@@ -932,7 +932,8 @@
     , m_ulTimeOfLastBytesToDur(0)
     , m_pPDSObserverList(NULL)
     , m_pBytesToDur(NULL)
-    , m_ulStatusUpdateGranularityInMsec(PRDN_DEFAULT_STATUSREPORT_INTERVAL_MSEC)
+    , m_ulStatusUpdateGranularityInMsec(
+            HX_PROGDOWNLD_DEFAULT_STATUSREPORT_INTERVAL_MSEC)
     , m_bHaveReportedSupByteRngs(FALSE)
 #endif // /HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS.
 
@@ -1530,7 +1531,8 @@
     m_ulTimeOfLastBytesToDur = 0;
     HX_RELEASE(m_pBytesToDur);
     m_bHaveReportedSupByteRngs = FALSE;
-    m_ulStatusUpdateGranularityInMsec =PRDN_DEFAULT_STATUSREPORT_INTERVAL_MSEC;
+    m_ulStatusUpdateGranularityInMsec =
+            HX_PROGDOWNLD_DEFAULT_STATUSREPORT_INTERVAL_MSEC;
     if (m_pPDSObserverList)
     {
         CHXSimpleList::Iterator i = m_pPDSObserverList->Begin();
@@ -2865,7 +2867,6 @@
                 HXLOGL1(HXLOG_HTTP, "ProcessPendingReads Read() failure due to insufficient content");
                 m_pMutex->Unlock();
                 CallReadDone(HXR_FAIL , NULL);
-                HX_ASSERT(!m_PendingReadList.IsEmpty());
                 m_pMutex->Lock();
                 continue; // CallReadDone(HXR_FAIL..) for remaining reads in pending list
             }



[prev in list] [next in list] [prev in thread] [next in thread]