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
33fbc621
Commit
33fbc621
authored
Jan 09, 2020
by
Ulrich Sibiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pixmap.c: drop unused return code for nxagentDisconnectAllPixmaps
parent
7977b9f8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
Pixmap.c
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+6
-11
Pixmaps.h
nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
+1
-1
No files found.
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
View file @
33fbc621
...
...
@@ -647,9 +647,9 @@ void nxagentDisconnectPixmap(void *p0, XID x1, void *p2)
}
}
Bool
nxagentDisconnectAllPixmaps
(
void
)
void
nxagentDisconnectAllPixmaps
(
void
)
{
int
r
=
1
;
int
r
;
#ifdef TEST
fprintf
(
stderr
,
"nxagentDisconnectAllPixmaps: Going to iterate through pixmap resources.
\n
"
);
...
...
@@ -661,6 +661,7 @@ Bool nxagentDisconnectAllPixmaps(void)
* too.
*/
r
=
1
;
FindClientResourcesByType
(
clients
[
serverClient
->
index
],
RT_NX_PIXMAP
,
nxagentDisconnectPixmap
,
&
r
);
#ifdef WARNING
...
...
@@ -674,14 +675,7 @@ Bool nxagentDisconnectAllPixmaps(void)
#endif
/*
* FIXME: This is a bit cumbersome:
* - as stated below nxagentDisconnectPixmap will not modify r, so the result will stay at 1
* - at the end of each iteration r will be set to 1 anyway.
* So at the end of the loop r will always be 1. So the whole function will always return 1...
*/
r
=
1
;
for
(
int
i
=
0
;
i
<
MAXCLIENTS
;
r
=
1
,
i
++
)
for
(
int
i
=
0
;
i
<
MAXCLIENTS
;
i
++
)
{
if
(
clients
[
i
])
{
...
...
@@ -689,6 +683,7 @@ Bool nxagentDisconnectAllPixmaps(void)
fprintf
(
stderr
,
"nxagentDisconnectAllPixmaps: Going to disconnect pixmaps of client [%d].
\n
"
,
i
);
#endif
r
=
1
;
FindClientResourcesByType
(
clients
[
i
],
RT_PIXMAP
,
nxagentDisconnectPixmap
,
&
r
);
#ifdef WARNING
...
...
@@ -708,7 +703,7 @@ Bool nxagentDisconnectAllPixmaps(void)
fprintf
(
stderr
,
"nxagentDisconnectAllPixmaps: Pixmaps disconnection completed.
\n
"
);
#endif
return
r
;
return
;
}
void
nxagentReconnectPixmap
(
void
*
p0
,
XID
x1
,
void
*
p2
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
View file @
33fbc621
...
...
@@ -132,7 +132,7 @@ RegionPtr nxagentCreateRegion(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
void
nxagentReconnectPixmap
(
void
*
p0
,
XID
x1
,
void
*
p2
);
Bool
nxagentReconnectAllPixmaps
(
void
*
p0
);
void
nxagentDisconnectPixmap
(
void
*
p0
,
XID
x1
,
void
*
p2
);
Bool
nxagentDisconnectAllPixmaps
(
void
);
void
nxagentDisconnectAllPixmaps
(
void
);
int
nxagentDestroyNewPixmapResourceType
(
void
*
p
,
XID
id
);
...
...
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