summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-10-24 04:19:13 +0000
committerjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-10-24 04:19:13 +0000
commit13436ec1b5e2eb824507f54ff24bc9e57a7f7d8f (patch)
treea872581dcb0d0834400bd131a7342bec8a530f3d /ace
parent683ffa104d2bfda36628fbbe23acc887d9153174 (diff)
downloadATCD-13436ec1b5e2eb824507f54ff24bc9e57a7f7d8f.tar.gz
Removed template method specialization of shared_find. No longer
needed since Hash_Map_Manager has been changed to no longer rely on sentinel_.
Diffstat (limited to 'ace')
-rw-r--r--ace/Filecache.cpp35
1 files changed, 4 insertions, 31 deletions
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index 2cd2ed22a19..2ad009b1394 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -87,7 +87,7 @@ ACE_Filecache_Handle::handle (void) const
{
if (this->handle_ == ACE_INVALID_HANDLE && this->file_ != 0)
{
- ACE_Filecache_Handle *mutable_this =
+ ACE_Filecache_Handle *mutable_this =
(ACE_Filecache_Handle *) this;
mutable_this->handle_ = ACE_OS::dup (this->file_->handle ());
}
@@ -97,7 +97,7 @@ ACE_Filecache_Handle::handle (void) const
int
ACE_Filecache_Handle::error (void) const
{
- if (this->file_ == 0)
+ if (this->file_ == 0)
return -1;
else
return this->file_->error ();
@@ -154,33 +154,6 @@ ACE_Filecache_Hash::equal (const char *const &id1, const char *const &id2)
return ACE_OS::strcmp (id1, id2) == 0;
}
-int
-ACE_Filecache_Hash::shared_find (const char *const &ext_id,
- ACE_Filecache_Hash_Entry *&entry,
- ACE_Filecache_Hash_Entry *&prev,
- u_long &loc)
-{
- loc = this->hash (ext_id) % this->total_size_;
-
- ACE_Filecache_Hash_Entry *temp;
-
- for (temp = this->table_[loc];
- temp != this->sentinel_ && this->equal (temp->ext_id_, ext_id) == 0;
- temp = temp->next_)
- prev = temp;
-
- if (temp != this->sentinel_)
- {
- entry = temp;
- return 0;
- }
- else
- {
- errno = ENOENT;
- return -1;
- }
-}
-
#undef ACE_Filecache_Hash
#undef ACE_Filecache_Hash_Entry
@@ -357,7 +330,7 @@ ACE_Filecache::fetch (const char *filename)
if (handle)
filelock.acquire_read ();
}
- ACE_DEBUG ((LM_DEBUG, " (%t) CVF: found %s\n", filename));
+ ACE_DEBUG ((LM_DEBUG, " (%t) CVF: found %s\n", filename));
}
return handle;
@@ -515,7 +488,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const char *filename,
this->size_ = size;
ACE_OS::strcpy (this->filename_, filename);
this->action_ = ACE_Filecache_Object::WRITING;
-
+
// Can we access the file?
if (ACE_OS::access (this->filename_, R_OK|W_OK) == -1
// Does it exist?