all repos — fluxbox @ ad968e32b30ee6262574bc3e02b20d5b117f5b88

custom fork of the fluxbox windowmanager

Fix to make clang happy

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.
Nable 80 nable.maininbox@googlemail.com
commit

ad968e32b30ee6262574bc3e02b20d5b117f5b88

parent

90f2fcf031554577ce811e7f7151f2a78ea7a265

1 files changed, 5 insertions(+), 3 deletions(-)

jump to
M src/FbTk/FileUtil.ccsrc/FbTk/FileUtil.cc

@@ -112,9 +112,11 @@ }

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