diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-02 11:29:53 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 01:21:51 +0200 |
commit | 3bdcd172757a10aeaeceff4447a62f7513804893 (patch) | |
tree | 4a4538c5262daccdf1192046df29f4f9fac134e2 /nx-X11/programs/Xserver/dix | |
parent | a5c7b248eff667d25ffb45750ba6a79fce1d54cd (diff) | |
download | nx-libs-3bdcd172757a10aeaeceff4447a62f7513804893.tar.gz nx-libs-3bdcd172757a10aeaeceff4447a62f7513804893.tar.bz2 nx-libs-3bdcd172757a10aeaeceff4447a62f7513804893.zip |
hw/nxagent/NX*.c: Amend re-introduced nxagent warnings by fixing the corresponding code section in files included from "somewhere" in nx-X11/programs/Xserver/.
(1)
In file included from NXrender.c:44:0:
../../mi/../render/render.c: In function ‘swapStops’:
../../mi/../render/render.c:2541:13: warning: variable ‘colors’ set but not used [-Wunused-but-set-variable]
CARD16 *colors;
^
(2)
In file included from NXevents.c:133:0:
../../dix/events.c: In function ‘ReinitializeRootWindow’:
../../dix/events.c:2046:15: warning: unused variable ‘pScreen’ [-Wunused-variable]
ScreenPtr pScreen = win->drawable.pScreen;
^
../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’:
../../dix/events.c:2177:15: warning: variable ‘pScreen’ set but not used [-Wunused-but-set-variable]
ScreenPtr pScreen = pWin->drawable.pScreen;
^
In file included from NXevents.c:133:0:
../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’:
../../dix/events.c:2191:2: error: ‘pScreen’ undeclared (first use in this function)
pScreen = pWin->drawable.pScreen;
^
(3)
In file included from NXdixfonts.c:77:0:
../../dix/dixfonts.c: In function ‘GetFontPath’:
../../dix/dixfonts.c:1890:2: warning: return makes pointer from integer without a cast
return BadAlloc;
^
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r-- | nx-X11/programs/Xserver/dix/dixfonts.c | 2 |
1 files changed, 1 insertions, 1 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; |