Commit 6e8aee49 authored by Ulrich Sibiller's avatar Ulrich Sibiller

nxagent: move validateString as inline func to Utils.h

parent 19065e75
...@@ -70,7 +70,7 @@ is" without express or implied warranty. ...@@ -70,7 +70,7 @@ is" without express or implied warranty.
#include "Handlers.h" #include "Handlers.h"
#include "Error.h" #include "Error.h"
#include "Reconnect.h" #include "Reconnect.h"
#include "Atoms.h" #include "Utils.h"
/* /*
* NX includes and definitions. * NX includes and definitions.
......
...@@ -95,10 +95,6 @@ static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] = ...@@ -95,10 +95,6 @@ static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] =
static XErrorHandler previousErrorHandler = NULL; static XErrorHandler previousErrorHandler = NULL;
const char * validateString(const char *str) {
return str ? str : "(null)";
}
static void catchAndRedirect(Display* dpy, XErrorEvent* X) static void catchAndRedirect(Display* dpy, XErrorEvent* X)
{ {
if (X -> error_code == BadAccess && if (X -> error_code == BadAccess &&
......
...@@ -36,8 +36,6 @@ extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; ...@@ -36,8 +36,6 @@ extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS];
extern Bool nxagentWMIsRunning; extern Bool nxagentWMIsRunning;
extern const char * validateString(const char *);
/* /*
* Create the required atoms internally * Create the required atoms internally
* to the agent server. * to the agent server.
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "Handlers.h" #include "Handlers.h"
#include "Events.h" #include "Events.h"
#include "Drawable.h" #include "Drawable.h"
#include "Atoms.h" #include "Utils.h"
/* /*
* Need to include this after the stub * Need to include this after the stub
......
...@@ -57,7 +57,7 @@ is" without express or implied warranty. ...@@ -57,7 +57,7 @@ is" without express or implied warranty.
#include "Reconnect.h" #include "Reconnect.h"
#include "Args.h" #include "Args.h"
#include "Atoms.h" #include "Utils.h"
#include "compext/Compext.h" #include "compext/Compext.h"
#include <nx/NXalert.h> #include <nx/NXalert.h>
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "Pixmaps.h" #include "Pixmaps.h"
#include "Atoms.h" #include "Atoms.h"
#include "Trap.h" #include "Trap.h"
#include "Utils.h"
#include "compext/Compext.h" #include "compext/Compext.h"
......
...@@ -48,4 +48,8 @@ ...@@ -48,4 +48,8 @@
#define MAX(A, B) ( (A) > (B) ? (A) : (B) ); #define MAX(A, B) ( (A) > (B) ? (A) : (B) );
#endif #endif
static inline const char * validateString(const char *str) {
return str ? str : "(null)";
}
#endif /* __Utils_H__ */ #endif /* __Utils_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment