qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 18:15:54 +02:00
Code

In FileLister::browse, declare variables when they are needed

Browse Source
This commit is contained in:
Maarten ter Huurne 2014-08-13 07:14:30 +02:00
parent 2c76ddae50
commit 90a5f82b92
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/filelister.cpp
View File

@ -83,27 +83,24 @@ void FileLister::browse(const string& path, bool clean)
directories.clear(); directories.clear();
files.clear(); files.clear();
DIR *dirp;
string slashedPath = path; string slashedPath = path;
if (path[path.length() - 1] != '/') if (path[path.length() - 1] != '/')
slashedPath.push_back('/'); slashedPath.push_back('/');
DIR *dirp;
if ((dirp = opendir(slashedPath.c_str())) == NULL) { if ((dirp = opendir(slashedPath.c_str())) == NULL) {
ERROR("Unable to open directory: %s\n", slashedPath.c_str()); ERROR("Unable to open directory: %s\n", slashedPath.c_str());
return; return;
} }
string filepath, file; while (struct dirent *dptr = readdir(dirp)) {
struct stat st; string file = dptr->d_name;
struct dirent *dptr;
while ((dptr = readdir(dirp))) {
file = dptr->d_name;
if (file[0] == '.' && file != "..") if (file[0] == '.' && file != "..")
continue; continue;
filepath = slashedPath + file; string filepath = slashedPath + file;
struct stat st;
int statRet = stat(filepath.c_str(), &st); int statRet = stat(filepath.c_str(), &st);
if (statRet == -1) { if (statRet == -1) {
ERROR("Stat failed on '%s' with error '%s'\n", filepath.c_str(), strerror(errno)); ERROR("Stat failed on '%s' with error '%s'\n", filepath.c_str(), strerror(errno));