aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-10-10 17:47:40 +0200
committerReinhard Tartler <siretart@tauware.de>2011-10-10 17:47:40 +0200
commitbd433c6487a52f95e6bb949d5698dc5ea0923713 (patch)
tree9d1204522870111c81500239a1302feb03177abf /nx-X11/programs/Xserver/xkb
parent55a9311fb1df3b58f73efa575318e7341243392b (diff)
downloadnx-libs-bd433c6487a52f95e6bb949d5698dc5ea0923713.tar.gz
nx-libs-bd433c6487a52f95e6bb949d5698dc5ea0923713.tar.bz2
nx-libs-bd433c6487a52f95e6bb949d5698dc5ea0923713.zip
Imported nx-X11-3.3.0-6.tar.gznx-X11/3.3.0-6
Summary: Imported nx-X11-3.3.0-6.tar.gz Keywords: Imported nx-X11-3.3.0-6.tar.gz into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
-rw-r--r--nx-X11/programs/Xserver/xkb/ddxLoad.c7
-rw-r--r--nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original7
2 files changed, 12 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 8e35ab82a..e69d95670 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -719,7 +719,12 @@ char tmpname[PATH_MAX];
}
#ifdef TEST
- fprintf(stderr, "XkbDDXCompileKeymapByNames: Executing command [%s].\n", buf);
+ if (buf != NULL)
+ fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+ "Executing command [%s].\n", buf);
+ else
+ fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+ "Callin Popen() with null command.\n");
#endif
#ifndef WIN32
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
index 8e35ab82a..e69d95670 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
@@ -719,7 +719,12 @@ char tmpname[PATH_MAX];
}
#ifdef TEST
- fprintf(stderr, "XkbDDXCompileKeymapByNames: Executing command [%s].\n", buf);
+ if (buf != NULL)
+ fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+ "Executing command [%s].\n", buf);
+ else
+ fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+ "Callin Popen() with null command.\n");
#endif
#ifndef WIN32