nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to make clang happy

Browse source 
POSIX states that 'd_name' in 'struct dirent' is char[], so it cannot be NULL.
This will result in the compiler complainting about an expression which always
evaluates to true ... for this compiler (clang). But in some implementations
'd_name' is a 'char*' that's why it's better to keep the check for possible
NULL.
This commit is contained in:
Nable 80 2015-01-03 21:47:51 +01:00 committed by Mathias Gumz
parent 90f2fcf031
commit ad968e32b3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/FbTk/FileUtil.cc
View file

@ -112,9 +112,11 @@ struct dirent *Directory::read() {
std::string Directory::readFilename() { std::string Directory::readFilename() {
dirent *ent = read(); dirent *ent = read();
if (ent == 0) const char* name = 0;
return ""; if (ent) {
return (ent->d_name ? ent->d_name : ""); name = ent->d_name;
}
return (name ? name : "");
} }
void Directory::close() { void Directory::close() {