diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 22:44:58 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 22:44:58 +0100 |
commit | 05aabb4e6f45bcb2c951ec04026f9d7bce7335b3 (patch) | |
tree | 7eb1bb1a0e4633e77edf9d3d8e3829849303f1cd /nx-X11/programs/Xserver/hw | |
parent | 96e2556031c8aff62a4650b9cfb814991f5240e1 (diff) | |
parent | 06bb154df0a4d6e35885bce6a63057bd8f8636e8 (diff) | |
download | nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.gz nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.bz2 nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.zip |
Merge branch 'uli42-pr/fix_validatestring' into 3.6.x
Attributes GH PR #359: https://github.com/ArcticaProject/nx-libs/pull/359
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Agent.h | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Client.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Utils.h | 4 |
6 files changed, 8 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h index 8577865a2..af8b62810 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h @@ -133,6 +133,4 @@ typedef XID KeySym64; #undef KeySym #endif /*_XSERVER64_tmp*/ -#define validateString(string) ((string) ? (string) : "(null)") - #endif /* __Agent_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 3844fe046..a6c21503a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -70,6 +70,7 @@ is" without express or implied warranty. #include "Handlers.h" #include "Error.h" #include "Reconnect.h" +#include "Utils.h" /* * NX includes and definitions. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index 44d48d0e0..38d877ed7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -51,6 +51,7 @@ #include "Handlers.h" #include "Events.h" #include "Drawable.h" +#include "Utils.h" /* * Need to include this after the stub diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 97a90e176..e1f12e733 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -57,6 +57,7 @@ is" without express or implied warranty. #include "Reconnect.h" #include "Args.h" +#include "Utils.h" #include "compext/Compext.h" #include <nx/NXalert.h> diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index eabf719c4..68c6890d8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -38,6 +38,7 @@ #include "Pixmaps.h" #include "Atoms.h" #include "Trap.h" +#include "Utils.h" #include "compext/Compext.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/nx-X11/programs/Xserver/hw/nxagent/Utils.h index a3cbc2e9f..8a3335424 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Utils.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Utils.h @@ -48,4 +48,8 @@ #define MAX(A, B) ( (A) > (B) ? (A) : (B) ); #endif +static inline const char * validateString(const char *str) { + return str ? str : "(null)"; +} + #endif /* __Utils_H__ */ |