[not part of build] changes to build correctly on Mac, and link corre…

…ctly on all platforms.
dothq · Feb 24, 2001 · c637de1 · c637de1
1 parent e16678d
commit c637de1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/netwerk/cache/src/nsCacheEntry.cpp b/netwerk/cache/src/nsCacheEntry.cpp
@@ -45,7 +45,7 @@ nsCacheEntry::nsCacheEntry(nsCString * key)
     PR_INIT_CLIST(&mDescriptorQ);
 
     mLastFetched = mLastValidated = PR_Now();
-    mExpirationTime = 0;
+    mExpirationTime = LL_ZERO;
 }
 
 
@@ -290,6 +290,13 @@ nsCacheEntryHashTable::GetKey( PLDHashTable * /*table*/, PLDHashEntryHdr *hashEn
     return cacheEntry->mKey;
 }
 
+PLDHashNumber
+nsCacheEntryHashTable::HashKey( PLDHashTable *table, const void *key)
+{
+    // XXX write a good hash function!
+    return PLDHashNumber(key);
+}
+
 PRBool
 nsCacheEntryHashTable::MatchEntry(PLDHashTable *       /* table */,
                                   const PLDHashEntryHdr * hashEntry,

diff --git a/netwerk/cache/src/nsCacheEntry.h b/netwerk/cache/src/nsCacheEntry.h
@@ -64,14 +64,14 @@ class nsCacheEntry
 
     void GetLastFetched( PRTime * result)     { if (result) *result = mLastFetched; }
     void SetLastFetched( PRTime   lastFetched)
-              { if (lastFetched) mLastFetched = lastFetched; }
+              { if (!LL_IS_ZERO(lastFetched)) mLastFetched = lastFetched; }
 
     void GetLastValidated( PRTime * result)   { if (result) *result = mLastValidated; }
     void SetLastValidated( PRTime   lastValidated)
-              { if (lastValidated) mLastValidated = lastValidated; }
+              { if (!LL_IS_ZERO(lastValidated)) mLastValidated = lastValidated; }
 
     void GetExpirationTime( PRTime * result)  { if (result) *result = mExpirationTime; }
-    void SetExpirationTime( PRTime   expires) { if (expires) mExpirationTime = expires; }
+    void SetExpirationTime( PRTime   expires) { if (!LL_IS_ZERO(expires)) mExpirationTime = expires; }
 
     void GetDataSize( PRUint32 * result)      { if (result) *result = mDataSize; }
     void SetDataSize( PRUint32   size)        { mDataSize = size; }

diff --git a/netwerk/cache/src/nsCacheService.cpp b/netwerk/cache/src/nsCacheService.cpp
@@ -285,7 +285,7 @@ nsCacheService::ActivateEntry(nsCacheRequest * request,
 }
 
 
-nsresult
+static nsresult
 SearchCacheDevices(nsCacheEntry * entry, nsCacheDevice ** result)
 {
     nsresult        rv = NS_OK;
@@ -384,6 +384,13 @@ nsCacheClientHashTable::GetKey( PLDHashTable * /*table*/, PLDHashEntryHdr *hashE
     return ((nsCacheClientHashTableEntry *)hashEntry)->clientID;
 }
 
+PLDHashNumber
+nsCacheClientHashTable::HashKey( PLDHashTable *table, const void *key)
+{
+    // XXX write a good hash function!
+    return PLDHashNumber(key);
+}
+
 PRBool
 nsCacheClientHashTable::MatchEntry(PLDHashTable *       /* table */,
                                   const PLDHashEntryHdr * hashEntry,

diff --git a/netwerk/cache/src/nsMemoryCacheDevice.h b/netwerk/cache/src/nsMemoryCacheDevice.h
@@ -42,10 +42,15 @@ class nsMemoryCacheDevice : public nsCacheDevice
 
     static nsresult  Create(nsCacheDevice **result);
 
+    virtual const char *  GetDeviceID(void);
 
     virtual nsresult ActivateEntryIfFound( nsCacheEntry * entry );
     virtual nsresult DeactivateEntry( nsCacheEntry * entry );
     virtual nsresult BindEntry( nsCacheEntry * entry );
+    virtual nsresult GetTransportForEntry( nsCacheEntry * entry,
+                                           nsITransport **transport );
+
+    virtual nsresult OnDataSizeChanged( nsCacheEntry * entry );
 
 private:
     nsCacheEntryHashTable   mInactiveEntries;