aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/entropy/egd
diff options
context:
space:
mode:
authorRenĂ© Korthaus <[email protected]>2015-12-23 11:52:19 +0100
committerJack Lloyd <[email protected]>2016-01-08 19:09:51 -0500
commitd22bc10cd4f67924acd82bcd46a31e3de3b20ce3 (patch)
tree58459585e6675cd799b6ef5900be026825cd6f9d /src/lib/entropy/egd
parent2fbfdd7e5afb5e888fd8c0b56c6df09e2bdeaca7 (diff)
Mass-prefix member vars with m_
Diffstat (limited to 'src/lib/entropy/egd')
-rw-r--r--src/lib/entropy/egd/es_egd.cpp16
-rw-r--r--src/lib/entropy/egd/es_egd.h4
2 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/entropy/egd/es_egd.cpp b/src/lib/entropy/egd/es_egd.cpp
index ba43cc86d..9bc6de6fe 100644
--- a/src/lib/entropy/egd/es_egd.cpp
+++ b/src/lib/entropy/egd/es_egd.cpp
@@ -25,7 +25,7 @@
namespace Botan {
EGD_EntropySource::EGD_Socket::EGD_Socket(const std::string& path) :
- socket_path(path), m_fd(-1)
+ m_socket_path(path), m_fd(-1)
{
}
@@ -69,7 +69,7 @@ size_t EGD_EntropySource::EGD_Socket::read(byte outbuf[], size_t length)
if(m_fd < 0)
{
- m_fd = open_socket(socket_path);
+ m_fd = open_socket(m_socket_path);
if(m_fd < 0)
return 0;
}
@@ -121,14 +121,14 @@ void EGD_EntropySource::EGD_Socket::close()
EGD_EntropySource::EGD_EntropySource(const std::vector<std::string>& paths)
{
for(size_t i = 0; i != paths.size(); ++i)
- sockets.push_back(EGD_Socket(paths[i]));
+ m_sockets.push_back(EGD_Socket(paths[i]));
}
EGD_EntropySource::~EGD_EntropySource()
{
- for(size_t i = 0; i != sockets.size(); ++i)
- sockets[i].close();
- sockets.clear();
+ for(size_t i = 0; i != m_sockets.size(); ++i)
+ m_sockets[i].close();
+ m_sockets.clear();
}
/**
@@ -140,9 +140,9 @@ void EGD_EntropySource::poll(Entropy_Accumulator& accum)
secure_vector<byte>& buf = accum.get_io_buf(BOTAN_SYSTEM_RNG_POLL_REQUEST);
- for(size_t i = 0; i != sockets.size(); ++i)
+ for(size_t i = 0; i != m_sockets.size(); ++i)
{
- size_t got = sockets[i].read(buf.data(), buf.size());
+ size_t got = m_sockets[i].read(buf.data(), buf.size());
if(got)
{
diff --git a/src/lib/entropy/egd/es_egd.h b/src/lib/entropy/egd/es_egd.h
index 0b497a8bd..e03fcf009 100644
--- a/src/lib/entropy/egd/es_egd.h
+++ b/src/lib/entropy/egd/es_egd.h
@@ -38,12 +38,12 @@ class EGD_EntropySource : public Entropy_Source
private:
static int open_socket(const std::string& path);
- std::string socket_path;
+ std::string m_socket_path;
int m_fd; // cached fd
};
std::mutex m_mutex;
- std::vector<EGD_Socket> sockets;
+ std::vector<EGD_Socket> m_sockets;
};
}