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
13536693
Commit
13536693
authored
Apr 09, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NXdispatch.c: free font data on exit
helps to avoid valgrind warnings
parent
99f541c1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
Font.c
nx-X11/programs/Xserver/hw/nxagent/Font.c
+8
-1
Font.h
nx-X11/programs/Xserver/hw/nxagent/Font.h
+1
-0
NXdispatch.c
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+1
-0
No files found.
nx-X11/programs/Xserver/hw/nxagent/Font.c
View file @
13536693
...
...
@@ -102,7 +102,6 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
static
XFontStruct
*
nxagentLoadQueryFont
(
register
Display
*
dpy
,
char
*
fontName
,
FontPtr
pFont
);
int
nxagentFreeFont
(
XFontStruct
*
fs
);
static
Bool
nxagentGetFontServerPath
(
char
*
fontServerPath
,
int
size
);
static
char
*
nxagentMakeScalableFontName
(
const
char
*
fontName
,
int
scalableResolution
);
RESTYPE
RT_NX_FONT
;
...
...
@@ -158,6 +157,14 @@ static struct _nxagentFailedToReconnectFonts
int
index
;
}
nxagentFailedToReconnectFonts
=
{
NULL
,
NULL
,
0
,
0
};
static
void
nxagentFreeRemoteFontList
(
nxagentFontList
*
listRec
);
void
nxagentFreeFontData
(
void
)
{
nxagentFreeFontCache
();
nxagentFreeRemoteFontList
(
&
nxagentRemoteFontList
);
}
/*
* This is used if nxagentFullGeneration is true in CloseDisplay().
*/
...
...
nx-X11/programs/Xserver/hw/nxagent/Font.h
View file @
13536693
...
...
@@ -82,4 +82,5 @@ void nxagentVerifyDefaultFontPath(void);
int
nxagentSplitString
(
char
*
string
,
char
*
fields
[],
int
nfields
,
char
*
sep
);
void
nxagentFreeFontData
(
void
);
#endif
/* __Font_H__ */
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @
13536693
...
...
@@ -581,6 +581,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
saveAgentState
(
"TERMINATED"
);
nxagentFreeAtomMap
();
nxagentFreeFontData
();
#endif
/* NXAGENT_SERVER */
KillAllClients
();
...
...
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