Skip to content

N
nx-libs
Commit a9826072 authored by walter harms's avatar walter harms Committed by Ulrich Sibiller
Browse files
Options

libX11: rm redundante NULL checks

This patch removes the last remaining NULL checks for Xfree() Signed-off-by: 's avatarHarms <wharms@bfs,de> Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 1ff69612
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 65 deletions
nx-X11/lib/X11/GetWMProto.c
View file @ a9826072
...@@ -77,7 +77,7 @@ Status XGetWMProtocols ( ...@@ -77,7 +77,7 @@ Status XGetWMProtocols (
return False; return False;
if (actual_type != XA_ATOM || actual_format != 32) { if (actual_type != XA_ATOM || actual_format != 32) {
if (data) Xfree (data); Xfree (data);
return False; return False;
} }
......
nx-X11/lib/X11/ICWrap.c
View file @ a9826072
...@@ -186,7 +186,7 @@ XSetIMValues(XIM im, ...) ...@@ -186,7 +186,7 @@ XSetIMValues(XIM im, ...)
va_end(var); va_end(var);
ret = (*im->methods->set_values) (im, args); ret = (*im->methods->set_values) (im, args);
if (args) Xfree(args); Xfree(args);
return ret; return ret;
} }
...@@ -213,7 +213,7 @@ XGetIMValues(XIM im, ...) ...@@ -213,7 +213,7 @@ XGetIMValues(XIM im, ...)
va_end(var); va_end(var);
ret = (*im->methods->get_values) (im, args); ret = (*im->methods->get_values) (im, args);
if (args) Xfree(args); Xfree(args);
return ret; return ret;
} }
...@@ -245,7 +245,7 @@ XCreateIC(XIM im, ...) ...@@ -245,7 +245,7 @@ XCreateIC(XIM im, ...)
va_end(var); va_end(var);
ic = (XIC) (*im->methods->create_ic) (im, args); ic = (XIC) (*im->methods->create_ic) (im, args);
if (args) Xfree(args); Xfree(args);
if (ic) { if (ic) {
ic->core.next = im->core.ic_chain; ic->core.next = im->core.ic_chain;
im->core.ic_chain = ic; im->core.ic_chain = ic;
...@@ -300,7 +300,7 @@ XGetICValues(XIC ic, ...) ...@@ -300,7 +300,7 @@ XGetICValues(XIC ic, ...)
va_end(var); va_end(var);
ret = (*ic->methods->get_values) (ic, args); ret = (*ic->methods->get_values) (ic, args);
if (args) Xfree(args); Xfree(args);
return ret; return ret;
} }
...@@ -330,7 +330,7 @@ XSetICValues(XIC ic, ...) ...@@ -330,7 +330,7 @@ XSetICValues(XIC ic, ...)
va_end(var); va_end(var);
ret = (*ic->methods->set_values) (ic, args); ret = (*ic->methods->set_values) (ic, args);
if (args) Xfree(args); Xfree(args);
return ret; return ret;
} }
......
nx-X11/lib/X11/XDefaultOMIF.c
View file @ a9826072
...@@ -367,8 +367,8 @@ init_core_part( ...@@ -367,8 +367,8 @@ init_core_part(
return True; return True;
err: err:
if (font_name_list)
Xfree(font_name_list); Xfree(font_name_list);
Xfree(font_struct_list); Xfree(font_struct_list);
return False; return False;
...@@ -636,14 +636,10 @@ destroy_oc( ...@@ -636,14 +636,10 @@ destroy_oc(
XOCGenericPart *gen = XOC_GENERIC(oc); XOCGenericPart *gen = XOC_GENERIC(oc);
XFontStruct **font_list, *font; XFontStruct **font_list, *font;
if (gen->font_set)
Xfree(gen->font_set);
if (oc->core.base_name_list)
Xfree(oc->core.base_name_list);
if (oc->core.font_info.font_name_list) Xfree(gen->font_set);
XFreeStringList(oc->core.font_info.font_name_list); Xfree(oc->core.base_name_list);
XFreeStringList(oc->core.font_info.font_name_list);
if ((font_list = oc->core.font_info.font_struct_list)) { if ((font_list = oc->core.font_info.font_struct_list)) {
if ((font = *font_list)) { if ((font = *font_list)) {
...@@ -655,14 +651,12 @@ destroy_oc( ...@@ -655,14 +651,12 @@ destroy_oc(
Xfree(oc->core.font_info.font_struct_list); Xfree(oc->core.font_info.font_struct_list);
} }
if (oc->core.missing_list.charset_list)
XFreeStringList(oc->core.missing_list.charset_list); XFreeStringList(oc->core.missing_list.charset_list);
#ifdef notdef #ifdef notdef
if (oc->core.res_name) Xfree(oc->core.res_name);
Xfree(oc->core.res_name); Xfree(oc->core.res_class);
if (oc->core.res_class)
Xfree(oc->core.res_class);
#endif #endif
Xfree(oc); Xfree(oc);
...@@ -1043,7 +1037,6 @@ close_om( ...@@ -1043,7 +1037,6 @@ close_om(
if (data->font_data) { if (data->font_data) {
for (font_data = data->font_data, count = data->font_data_count; for (font_data = data->font_data, count = data->font_data_count;
count-- > 0 ; font_data++) { count-- > 0 ; font_data++) {
if (font_data->name)
Xfree(font_data->name); Xfree(font_data->name);
} }
Xfree(data->font_data); Xfree(data->font_data);
...@@ -1051,17 +1044,16 @@ close_om( ...@@ -1051,17 +1044,16 @@ close_om(
Xfree(gen->data); Xfree(gen->data);
} }
if (om->core.res_name)
Xfree(om->core.res_name); Xfree(om->core.res_name);
if (om->core.res_class) Xfree(om->core.res_class);
Xfree(om->core.res_class);
if (om->core.required_charset.charset_list) if (om->core.required_charset.charset_list)
XFreeStringList(om->core.required_charset.charset_list); XFreeStringList(om->core.required_charset.charset_list);
else else
Xfree((char*)om->core.required_charset.charset_list); Xfree((char*)om->core.required_charset.charset_list);
if (om->core.orientation_list.orientation)
Xfree(om->core.orientation_list.orientation);
Xfree(om->core.orientation_list.orientation);
Xfree(om); Xfree(om);
return 1; return 1;
......
nx-X11/lib/X11/XKBGAlloc.c
View file @ a9826072
...@@ -177,8 +177,7 @@ _XkbClearColor(char *color_in) ...@@ -177,8 +177,7 @@ _XkbClearColor(char *color_in)
{ {
XkbColorPtr color = (XkbColorPtr) color_in; XkbColorPtr color = (XkbColorPtr) color_in;
if (color->spec) _XkbFree(color->spec);
_XkbFree(color->spec);
return; return;
} }
...@@ -660,8 +659,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value) ...@@ -660,8 +659,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
return NULL; return NULL;
for (i = 0, prop = geom->properties; i < geom->num_properties; i++, prop++) { for (i = 0, prop = geom->properties; i < geom->num_properties; i++, prop++) {
if ((prop->name) && (strcmp(name, prop->name) == 0)) { if ((prop->name) && (strcmp(name, prop->name) == 0)) {
if (prop->value) _XkbFree(prop->value);
_XkbFree(prop->value);
prop->value = strdup(value); prop->value = strdup(value);
return prop; return prop;
} }
......
nx-X11/lib/X11/lcFile.c
View file @ a9826072
...@@ -554,7 +554,7 @@ _XlcResolveLocaleName( ...@@ -554,7 +554,7 @@ _XlcResolveLocaleName(
break; break;
} }
} }
if (nlc_name) Xfree(nlc_name); Xfree(nlc_name);
if (name == NULL) { if (name == NULL) {
/* vendor locale name == Xlocale name, no expansion of alias */ /* vendor locale name == Xlocale name, no expansion of alias */
...@@ -672,19 +672,18 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, const char *lc_name) ...@@ -672,19 +672,18 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, const char *lc_name)
target_name = NULL; target_name = NULL;
} }
} }
if (nlc_name) Xfree(nlc_name); Xfree(nlc_name);
if (target_name == NULL) if (target_name == NULL)
/* vendor locale name == Xlocale name, no expansion of alias */ /* vendor locale name == Xlocale name, no expansion of alias */
snprintf(dir_name, dir_len, "%s/%s", args[0], lc_name); snprintf(dir_name, dir_len, "%s/%s", args[0], lc_name);
else else
snprintf(dir_name, dir_len, "%s/%s", target_dir, target_name); snprintf(dir_name, dir_len, "%s/%s", target_dir, target_name);
Xfree(target_name); Xfree(target_name);
Xfree (last_dir_name);
Xfree (last_lc_name);
if (last_dir_name != 0)
Xfree (last_dir_name);
if (last_lc_name != 0)
Xfree (last_lc_name);
last_dir_len = strlen (dir_name) + 1; last_dir_len = strlen (dir_name) + 1;
last_dir_name = Xmalloc (last_dir_len); last_dir_name = Xmalloc (last_dir_len);
strcpy (last_dir_name, dir_name); strcpy (last_dir_name, dir_name);
...@@ -751,7 +750,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, const char *lc_name) ...@@ -751,7 +750,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, const char *lc_name)
target_name = NULL; target_name = NULL;
} }
} }
if (nlc_name) Xfree(nlc_name); Xfree(nlc_name);
if (target_name == NULL) if (target_name == NULL)
/* vendor locale name == Xlocale name, no expansion of alias */ /* vendor locale name == Xlocale name, no expansion of alias */
...@@ -759,11 +758,9 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, const char *lc_name) ...@@ -759,11 +758,9 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, const char *lc_name)
else else
snprintf(dir_name, dir_len, "%s/%s", target_dir, target_name); snprintf(dir_name, dir_len, "%s/%s", target_dir, target_name);
Xfree(target_name); Xfree(target_name);
Xfree (last_dir_name);
Xfree (last_lc_name);
if (last_dir_name != 0)
Xfree (last_dir_name);
if (last_lc_name != 0)
Xfree (last_lc_name);
last_dir_len = strlen (dir_name) + 1; last_dir_len = strlen (dir_name) + 1;
last_dir_name = Xmalloc (last_dir_len); last_dir_name = Xmalloc (last_dir_len);
strcpy (last_dir_name, dir_name); strcpy (last_dir_name, dir_name);
......
nx-X11/lib/X11/lcGeneric.c
View file @ a9826072
...@@ -259,8 +259,8 @@ add_parse_list( ...@@ -259,8 +259,8 @@ add_parse_list(
err: err:
Xfree(str); Xfree(str);
if (new)
Xfree(new); Xfree(new);
return False; return False;
} }
...@@ -273,12 +273,10 @@ free_charset( ...@@ -273,12 +273,10 @@ free_charset(
ParseInfo *parse_info; ParseInfo *parse_info;
int num; int num;
if (gen->mb_parse_table) Xfree(gen->mb_parse_table);
Xfree(gen->mb_parse_table);
if ((num = gen->mb_parse_list_num) > 0) { if ((num = gen->mb_parse_list_num) > 0) {
for (parse_info = gen->mb_parse_list; num-- > 0; parse_info++) { for (parse_info = gen->mb_parse_list; num-- > 0; parse_info++) {
if ((*parse_info)->encoding) Xfree((*parse_info)->encoding);
Xfree((*parse_info)->encoding);
Xfree(*parse_info); Xfree(*parse_info);
} }
Xfree(gen->mb_parse_list); Xfree(gen->mb_parse_list);
......
nx-X11/lib/X11/lcPrTxt.c
View file @ a9826072
...@@ -283,8 +283,7 @@ _XwcFreeStringList( ...@@ -283,8 +283,7 @@ _XwcFreeStringList(
wchar_t **list) wchar_t **list)
{ {
if (list) { if (list) {
if (*list) Xfree(*list);
Xfree(*list);
Xfree(list); Xfree(list);
} }
} }
nx-X11/lib/X11/lcPublic.c
View file @ a9826072
...@@ -254,16 +254,14 @@ static void ...@@ -254,16 +254,14 @@ static void
destroy_core( destroy_core(
XLCd lcd) XLCd lcd)
{ {
if (lcd->core) { if (lcd) {
if (lcd->core->name) if (lcd->core) {
Xfree(lcd->core->name); Xfree(lcd->core->name);
Xfree(lcd->core); Xfree(lcd->core);
}
Xfree(lcd->methods);
Xfree(lcd);
} }
if (lcd->methods)
Xfree(lcd->methods);
Xfree(lcd);
} }
static void static void
...@@ -274,10 +272,8 @@ destroy( ...@@ -274,10 +272,8 @@ destroy(
_XlcDestroyLocaleDataBase(lcd); _XlcDestroyLocaleDataBase(lcd);
if (pub->siname) Xfree(pub->siname);
Xfree(pub->siname); Xfree(pub->encoding_name);
if (pub->encoding_name)
Xfree(pub->encoding_name);
destroy_core(lcd); destroy_core(lcd);
} }
......
nx-X11/lib/X11/lcWrap.c
View file @ a9826072
...@@ -86,8 +86,7 @@ XSetLocaleModifiers( ...@@ -86,8 +86,7 @@ XSetLocaleModifiers(
user_mods = getenv("XMODIFIERS"); user_mods = getenv("XMODIFIERS");
mapped_mods = (*lcd->methods->map_modifiers) (lcd, user_mods, modifiers); mapped_mods = (*lcd->methods->map_modifiers) (lcd, user_mods, modifiers);
if (mapped_mods) { if (mapped_mods) {
if (lcd->core->modifiers) Xfree(lcd->core->modifiers);
Xfree(lcd->core->modifiers);
lcd->core->modifiers = mapped_mods; lcd->core->modifiers = mapped_mods;
} }
return mapped_mods; return mapped_mods;
......
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