[Libreoffice-commits] online.git: loolwsd/loolmap.c

Miklos Vajna vmiklos at collabora.co.uk
Fri Jan 8 00:08:44 PST 2016


 loolwsd/loolmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e5841cc584230d6dbddc1c918b5d924d39eaa2f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jan 8 09:07:27 2016 +0100

    loolwsd: -Werror,-Wpointer-bool-conversion
    
    error: address of array 'dir_proc->d_name' will always evaluate to 'true'
    
    Henry says this is the correct fix.

diff --git a/loolwsd/loolmap.c b/loolwsd/loolmap.c
index 21792b9..21dffd1 100644
--- a/loolwsd/loolmap.c
+++ b/loolwsd/loolmap.c
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 
   while ( ( dir_proc = readdir(root_proc) ) )
   {
-    if ( !dir_proc && !dir_proc->d_name )
+    if ( !dir_proc && !dir_proc->d_name[0] )
       error(EXIT_FAILURE, ENOTDIR, "bad dir");
 
     if ( *dir_proc->d_name > '0' && *dir_proc->d_name <= '9' )


More information about the Libreoffice-commits mailing list