[Libreoffice-commits] core.git: setup_native/scripts

[Stephan Bergmann]

 setup_native/scripts/source/getuid.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 077ad1a5ab6848255e0350df368c4f45ae73da9c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 27 21:55:52 2014 +0100

    -Werror,-Wtautological-pointer-compare
    
    (/usr/include/sys/stat.h annotates __lxstat params as __nonnull)
    
    Change-Id: I4297c4a05f54bc35688b65dd1ddcdeb7bc7fc37b

diff --git a/setup_native/scripts/source/getuid.c b/setup_native/scripts/source/getuid.c
index 17ed60d..d3660f4 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <assert.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -122,11 +123,9 @@ int __lxstat(int n, const char *path, struct stat *buf)
         p_lstat = (int (*)(int n, const char *path, struct stat *buf))
             dlsym (RTLD_NEXT, "__lxstat");
     ret = (*p_lstat)(n, path, buf);
-    if (buf != NULL)
-    {
-        buf->st_uid = 0; /* root */
-        buf->st_gid = 0; /* root */
-    }
+    assert(buf != NULL);
+    buf->st_uid = 0; /* root */
+    buf->st_gid = 0; /* root */
     return ret;
 }
 #else