aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/dix/dixfonts.c2
-rw-r--r--nx-X11/programs/Xserver/render/render.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index c9d64c7b0..58e562411 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -1884,7 +1884,7 @@ GetFontPath(int *count, int *length)
if (c == NULL) {
free(font_path_string);
font_path_string = NULL;
- return BadAlloc;
+ return NULL;
}
font_path_string = c;
diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 3c14ac0e7..c73ff8305 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -2538,13 +2538,11 @@ static void swapStops(void *stuff, int num)
{
int i, n;
CARD32 *stops;
- CARD16 *colors;
stops = (CARD32 *)(stuff);
for (i = 0; i < num; ++i) {
swapl(stops, n);
++stops;
}
- colors = (CARD16 *)(stops);
for (i = 0; i < 4*num; ++i) {
swaps(stops, n);
++stops;