Skip to content

N
nx-libs
Commit a2008b28 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

NXdixfonts.c: free() can handle NULL

so let's remove some superflous tests
parent e0291f30
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
View file @ a2008b28
......@@ -478,7 +478,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
return TRUE;
}
if (err == FontNameAlias) {
if (resolved) free(resolved);
free(resolved);
resolved = (char *) malloc(resolvedlen + 1);
if (resolved)
memmove(resolved, tmpname, resolvedlen + 1);
......@@ -544,7 +544,6 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
{
c->saved = c->current;
c->haveSaved = TRUE;
if (c->savedName)
free(c->savedName);
c->savedName = (char *)malloc(namelen + 1);
if (c->savedName)
......@@ -663,14 +662,14 @@ bail:
for (i = 0; i < c->num_fpes; i++)
FreeFPE(c->fpe_list[i]);
free(c->fpe_list);
if (c->savedName) free(c->savedName);
free(c->savedName);
#ifdef HAS_XFONT2
xfont2_free_font_names(names);
#else
FreeFontNames(names);
#endif /* HAS_XFONT2 */
free(c);
if (resolved) free(resolved);
free(resolved);
return TRUE;
}
......@@ -856,7 +855,6 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
c->saved = c->current;
c->haveSaved = TRUE;
c->savedNumFonts = numFonts;
if (c->savedName)
free(c->savedName);
c->savedName = (char *)malloc(namelen + 1);
if (c->savedName)
......@@ -983,7 +981,7 @@ bail:
FreeFPE(c->fpe_list[i]);
free(c->reply);
free(c->fpe_list);
if (c->savedName) free(c->savedName);
free(c->savedName);
free(c);
return TRUE;
}
......@@ -1201,7 +1199,7 @@ nxdoListFontsAndAliases(client, fss)
return TRUE;
}
if (err == FontNameAlias) {
if (resolved) free(resolved);
free(resolved);
resolved = (char *) malloc(resolvedlen + 1);
if (resolved)
{
......@@ -1273,7 +1271,6 @@ nxdoListFontsAndAliases(client, fss)
{
c->saved = c->current;
c->haveSaved = TRUE;
if (c->savedName)
free(c->savedName);
c->savedName = (char *)malloc(namelen + 1);
if (c->savedName)
......@@ -1370,7 +1367,7 @@ finish:
for (i = 0; i < c->num_fpes; i++)
FreeFPE(c->fpe_list[i]);
free(c->fpe_list);
if (c->savedName) free(c->savedName);
free(c->savedName);
#ifdef HAS_XFONT2
xfont2_free_font_names(c->names);
#else
......@@ -1378,7 +1375,7 @@ finish:
#endif /* HAS_XFONT2 */
free(c);
free(fss);
if (resolved) free(resolved);
free(resolved);
return doOpenFont(client, oc);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment