xserver: Branch 'master'

[Adam Jackson]

 os/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aabf65d2a0206bd1a9c6e9a9f3153ded873dfd43
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 30 15:11:45 2017 -0400

    os: Fix warning in LockServer
    
    The meson build gives me:
    
    ../os/utils.c: In function ‘LockServer’:
    ../os/utils.c:310:40: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
         snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
                                            ^~~~~~~~~
    ../os/utils.c:310:5: note: ‘snprintf’ output between 12 and 13 bytes into a destination of size 12
         snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Which seems to be due to the %d part meaning that a negative number's -
    sign would be one wider than we're expecting. Fine, just coerce it to
    unsigned.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/os/utils.c b/os/utils.c
index 1972aa120..8a758f0b9 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -307,7 +307,7 @@ LockServer(void)
     }
     if (lfd < 0)
         FatalError("Could not create lock file in %s\n", tmp);
-    snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
+    snprintf(pid_str, sizeof(pid_str), "%10lu\n", (unsigned long) getpid());
     if (write(lfd, pid_str, 11) != 11)
         FatalError("Could not write pid to lock file in %s\n", tmp);
     (void) fchmod(lfd, 0444);