aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-12-30 22:25:22 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-01-15 16:38:11 +0100
commitc3b6dfe2e2c407ecdbcf0154495d246b10f6a7e7 (patch)
treed75da87f51f5f997e82ca5e4c4de686e2689d0fa
parent8bb7d2cd1aa8a0108c5ef66758bc337de239aa11 (diff)
downloadnx-libs-c3b6dfe2e2c407ecdbcf0154495d246b10f6a7e7.tar.gz
nx-libs-c3b6dfe2e2c407ecdbcf0154495d246b10f6a7e7.tar.bz2
nx-libs-c3b6dfe2e2c407ecdbcf0154495d246b10f6a7e7.zip
nxagent: make nxagentVerbose a Boolean
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Error.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Error.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Font.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Reconnect.c4
6 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 52aa055fc..7902e441d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -178,7 +178,7 @@ static void nxagentParseOptionString(char*);
static int nxagentGetDialogName(void);
-char nxagentVerbose = 0;
+Bool nxagentVerbose = False;
char *nxagentKeystrokeFile = NULL;
@@ -964,7 +964,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
if (!strcmp(argv[i], "-verbose"))
{
- nxagentVerbose = 1;
+ nxagentVerbose = True;
return 1;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index add5fae85..8c9a52d2e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -106,7 +106,7 @@ static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp);
int nxagentErrorHandler(Display *dpy, XErrorEvent *event)
{
- if (nxagentVerbose == 1)
+ if (nxagentVerbose)
{
nxagentPrintError(dpy, event, stderr);
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.h b/nx-X11/programs/Xserver/hw/nxagent/Error.h
index 9f5cfef74..76f120ff3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.h
@@ -32,7 +32,7 @@
extern char *nxagentClientsLogName;
-extern char nxagentVerbose;
+extern Bool nxagentVerbose;
int nxagentErrorHandler(Display *dpy, XErrorEvent *event);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 5eef6c0a4..b854bf29b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1959,7 +1959,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
if (nxagentExposeQueue.exposures[nxagentExposeQueue.start].serial != X.xconfigure.x)
{
#ifdef WARNING
- if (nxagentVerbose == 1)
+ if (nxagentVerbose)
{
fprintf(stderr, "%s: Requested ConfigureNotify changes didn't take place.\n", __func__);
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index dcbd6949a..0ce5b87ad 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -750,7 +750,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
if (numFontFields <= FIELDS)
{
#ifdef WARNING
- if (nxagentVerbose == 1)
+ if (nxagentVerbose)
{
fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Font name in non standard format.\n");
}
@@ -817,7 +817,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
}
#ifdef WARNING
- if (nxagentVerbose == 1)
+ if (nxagentVerbose)
{
fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Failed to load font '%s'. Replacing with '%s'.\n",
fontName, substFontBuf);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 9807a8e3b..ed1e673a8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -598,7 +598,7 @@ Bool nxagentReconnectSession(void)
if (nxagentResetKeyboard() == 0)
{
#ifdef WARNING
- if (nxagentVerbose == 1)
+ if (nxagentVerbose)
{
fprintf(stderr, "%s: Failed to reset keyboard device.\n", __func__);
}
@@ -699,7 +699,7 @@ nxagentReconnectError:
if (*nxagentGetReconnectError() == '\0')
{
#ifdef WARNING
- if (nxagentVerbose == 1)
+ if (nxagentVerbose)
{
fprintf(stderr, "nxagentReconnectSession: WARNING! The reconnect error message is not set. Failed step is [%d].\n",
failedStep);