From d476dbc8651dfb80dd32283f7b21548ee09398b0 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 7 Jan 2012 02:07:38 -0500 Subject: [PATCH] Fixed C99 correctness and signed/unsigned compiler warning --- src/video/x11/SDL_x11video.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index 5bb4deb92..f7d80732c 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -418,21 +418,18 @@ static void create_aux_windows(_THIS) } { + pid_t pid = getpid(); char hostname[256]; - if (gethostname(hostname, sizeof(hostname)) > -1) { + if (pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) { + Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False); + Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False); + hostname[sizeof(hostname)-1] = '\0'; - pid_t pid = getpid(); - - if (pid > 0) { - Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False); - Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False); - - XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32, - PropModeReplace, (unsigned char *)&pid, 1); - XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8, - PropModeReplace, hostname, SDL_strlen(hostname)); - } + XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&pid, 1); + XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8, + PropModeReplace, (unsigned char *)hostname, SDL_strlen(hostname)); } }