Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
6e8aee49
You need to sign in or sign up before continuing.
Commit
6e8aee49
authored
Mar 03, 2017
by
Ulrich Sibiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxagent: move validateString as inline func to Utils.h
parent
19065e75
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
9 deletions
+8
-9
Args.c
nx-X11/programs/Xserver/hw/nxagent/Args.c
+1
-1
Atoms.c
nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+0
-4
Atoms.h
nx-X11/programs/Xserver/hw/nxagent/Atoms.h
+0
-2
Client.c
nx-X11/programs/Xserver/hw/nxagent/Client.c
+1
-1
Font.c
nx-X11/programs/Xserver/hw/nxagent/Font.c
+1
-1
Rootless.c
nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+1
-0
Utils.h
nx-X11/programs/Xserver/hw/nxagent/Utils.h
+4
-0
No files found.
nx-X11/programs/Xserver/hw/nxagent/Args.c
View file @
6e8aee49
...
@@ -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 "
Atom
s.h"
#include "
Util
s.h"
/*
/*
* NX includes and definitions.
* NX includes and definitions.
...
...
nx-X11/programs/Xserver/hw/nxagent/Atoms.c
View file @
6e8aee49
...
@@ -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
&&
...
...
nx-X11/programs/Xserver/hw/nxagent/Atoms.h
View file @
6e8aee49
...
@@ -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.
...
...
nx-X11/programs/Xserver/hw/nxagent/Client.c
View file @
6e8aee49
...
@@ -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 "
Atom
s.h"
#include "
Util
s.h"
/*
/*
* Need to include this after the stub
* Need to include this after the stub
...
...
nx-X11/programs/Xserver/hw/nxagent/Font.c
View file @
6e8aee49
...
@@ -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 "
Atom
s.h"
#include "
Util
s.h"
#include "compext/Compext.h"
#include "compext/Compext.h"
#include <nx/NXalert.h>
#include <nx/NXalert.h>
...
...
nx-X11/programs/Xserver/hw/nxagent/Rootless.c
View file @
6e8aee49
...
@@ -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"
...
...
nx-X11/programs/Xserver/hw/nxagent/Utils.h
View file @
6e8aee49
...
@@ -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__ */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment