summaryrefslogtreecommitdiff
path: root/src/tool/dir.cpp
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2013-04-06 13:14:47 +0200
committerPaul Buetow <paul@buetow.org>2013-04-06 13:14:47 +0200
commitd4c9f10efe815af146438cafb694d16da0e5650a (patch)
tree93956195c448768b2d58892cb672bee36a6a6463 /src/tool/dir.cpp
parentee315a27b72dc967a8a90f132725b7c8e4fd9fba (diff)
tagging ychat-0.7.0ychat-0.7.0
Diffstat (limited to 'src/tool/dir.cpp')
-rw-r--r--src/tool/dir.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tool/dir.cpp b/src/tool/dir.cpp
index ae48d5f..392112a 100644
--- a/src/tool/dir.cpp
+++ b/src/tool/dir.cpp
@@ -12,7 +12,7 @@ dir::dir()
dir::~dir()
{
- vec_dir.clear();
+ dir_vec.clear();
close_dir();
}
@@ -29,9 +29,9 @@ dir::open_dir( string &s_dir )
if ( b_open )
return false;
- p_d = opendir( s_dir.c_str() );
+ dp = opendir( s_dir.c_str() );
- if ( p_d == NULL )
+ if ( dp == NULL )
return false; // Could not open dir.
b_open = true;
@@ -42,9 +42,9 @@ dir::open_dir( string &s_dir )
void
dir::close_dir()
{
- if ( b_open && p_d != NULL )
+ if ( b_open && dp != NULL )
{
- closedir( p_d );
+ closedir( dp );
b_open = false;
}
}
@@ -52,15 +52,15 @@ dir::close_dir()
void
dir::read_dir()
{
- if ( p_d != NULL )
- while( p_ep = readdir( p_d ) )
- vec_dir.push_back( string( p_ep->d_name ) );
+ if ( dp != NULL )
+ while( ep = readdir( dp ) )
+ dir_vec.push_back( string( ep->d_name ) );
}
vector<string>
dir::get_dir_vec()
{
- return vec_dir;
+ return dir_vec;
}
#endif