diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
| commit | ce182e88a11c3f3a3218241a6046f3aeb08aabb7 (patch) | |
| tree | 0c738dec27fdbdf055bf72caa0c96a57d6a706cf /nx-X11/programs/Xserver/hw/nxagent/Font.c | |
| parent | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (diff) | |
| parent | dc43f4c98287b283747e47e37501c5ca158a8aa6 (diff) | |
| download | nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.gz nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.bz2 nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.zip | |
Merge branch 'uli42-pr/simplify_free' into 3.6.x
Attributes GH PR #555: https://github.com/ArcticaProject/nx-libs/pull/555
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Font.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index f9c682765..3b35a8bff 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -841,10 +841,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP for (j = 0; j < numSearchFields; j++) { - if (searchFields[j] != NULL) - { - free(searchFields[j]); - } + free(searchFields[j]); } } } @@ -863,10 +860,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP for (j = 0; j < numFontFields; j++) { - if (fontNameFields[j] != NULL) - { - free(fontNameFields[j]); - } + free(fontNameFields[j]); } return fontStruct; @@ -1260,17 +1254,11 @@ static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, void * param2) static void nxagentFreeFailedToReconnectFonts() { - if (nxagentFailedToReconnectFonts.font != NULL) - { - free(nxagentFailedToReconnectFonts.font); - nxagentFailedToReconnectFonts.font = NULL; - } + free(nxagentFailedToReconnectFonts.font); + nxagentFailedToReconnectFonts.font = NULL; - if (nxagentFailedToReconnectFonts.id != NULL) - { - free(nxagentFailedToReconnectFonts.id); - nxagentFailedToReconnectFonts.id = NULL; - } + free(nxagentFailedToReconnectFonts.id); + nxagentFailedToReconnectFonts.id = NULL; nxagentFailedToReconnectFonts.size = 0; nxagentFailedToReconnectFonts.index = 0; @@ -1706,10 +1694,7 @@ int nxagentFreeFont(XFontStruct *fs) #endif } - if (fs -> properties) - { - free (fs->properties); - } + free (fs->properties); XFree(fs); |