aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <lloyd@randombit.net>2010-06-16 13:55:20 +0000
committerlloyd <lloyd@randombit.net>2010-06-16 13:55:20 +0000
commit7671e4eb33b244997c07bd548770b125ddde20d7 (patch)
treefe4c0bfd2dbb2159ecfdf6695b3b0f0133dee1d1
parent4e796f33416df825e5a9fdcbe2f8782579dd31cf (diff)
Hide File_Descriptor_Source
-rw-r--r--src/entropy/proc_walk/es_ftw.cpp16
-rw-r--r--src/entropy/proc_walk/es_ftw.h12
2 files changed, 16 insertions, 12 deletions
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;
};
}