From 76b57a7c4656f0f5759c34efe8bab664b49cd21d Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 15 Jun 2010 23:23:49 +0000 Subject: More Doxygen updates/fixes --- src/entropy/proc_walk/es_ftw.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/entropy/proc_walk') diff --git a/src/entropy/proc_walk/es_ftw.h b/src/entropy/proc_walk/es_ftw.h index d7a719818..337699564 100644 --- a/src/entropy/proc_walk/es_ftw.h +++ b/src/entropy/proc_walk/es_ftw.h @@ -25,6 +25,9 @@ class FTW_EntropySource : public EntropySource FTW_EntropySource(const std::string& root_dir); ~FTW_EntropySource(); + /** + * Returns file descriptors. Until it doesn't + */ class File_Descriptor_Source { public: @@ -32,7 +35,6 @@ class FTW_EntropySource : public EntropySource virtual ~File_Descriptor_Source() {} }; private: - std::string path; File_Descriptor_Source* dir; }; -- cgit v1.2.3 From 7671e4eb33b244997c07bd548770b125ddde20d7 Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 16 Jun 2010 13:55:20 +0000 Subject: Hide File_Descriptor_Source --- src/entropy/proc_walk/es_ftw.cpp | 16 +++++++++++++++- src/entropy/proc_walk/es_ftw.h | 12 +----------- 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'src/entropy/proc_walk') diff --git a/src/entropy/proc_walk/es_ftw.cpp b/src/entropy/proc_walk/es_ftw.cpp index 5e2b17860..53e39d834 100644 --- a/src/entropy/proc_walk/es_ftw.cpp +++ b/src/entropy/proc_walk/es_ftw.cpp @@ -22,9 +22,23 @@ namespace Botan { +/** +* Returns file descriptors. Until it doesn't +*/ +class File_Descriptor_Source + { + public: + /** + * @return next file descriptor, or -1 if done + */ + virtual int next_fd() = 0; + + virtual ~File_Descriptor_Source() {} + }; + namespace { -class Directory_Walker : public FTW_EntropySource::File_Descriptor_Source +class Directory_Walker : public File_Descriptor_Source { public: Directory_Walker(const std::string& root) { add_directory(root); } diff --git a/src/entropy/proc_walk/es_ftw.h b/src/entropy/proc_walk/es_ftw.h index 337699564..3ba222d46 100644 --- a/src/entropy/proc_walk/es_ftw.h +++ b/src/entropy/proc_walk/es_ftw.h @@ -24,19 +24,9 @@ class FTW_EntropySource : public EntropySource FTW_EntropySource(const std::string& root_dir); ~FTW_EntropySource(); - - /** - * Returns file descriptors. Until it doesn't - */ - class File_Descriptor_Source - { - public: - virtual int next_fd() = 0; - virtual ~File_Descriptor_Source() {} - }; private: std::string path; - File_Descriptor_Source* dir; + class File_Descriptor_Source* dir; }; } -- cgit v1.2.3