[PATCH] libX11: rm redundante NULL checks
Peter Hutterer
peter.hutterer at who-t.net
Mon Jun 16 17:55:06 PDT 2014
On Sat, Jun 07, 2014 at 03:17:27PM +0200, walter harms wrote:
>
> This patch removes the last remaining NULL checks for Xfree()
>
> Signed-off-by: Harms <wharms at bfs,de>
pushed with a couple of indentation fixes, thanks.
Cheers,
Peter
>
> ---
> src/GetWMProto.c | 2 +-
> src/xkb/XKBGAlloc.c | 6 ++----
> src/xlibi18n/ICWrap.c | 10 +++++-----
> src/xlibi18n/XDefaultOMIF.c | 36 ++++++++++++++----------------------
> src/xlibi18n/lcFile.c | 21 +++++++++------------
> src/xlibi18n/lcGeneric.c | 10 ++++------
> src/xlibi18n/lcPrTxt.c | 3 +--
> src/xlibi18n/lcPublic.c | 18 ++++++++----------
> src/xlibi18n/lcWrap.c | 3 +--
> 9 files changed, 45 insertions(+), 64 deletions(-)
>
> diff --git a/src/GetWMProto.c b/src/GetWMProto.c
> index 4e9f12c..cc1618d 100644
> --- a/src/GetWMProto.c
> +++ b/src/GetWMProto.c
> @@ -77,7 +77,7 @@ Status XGetWMProtocols (
> return False;
>
> if (actual_type != XA_ATOM || actual_format != 32) {
> - if (data) Xfree (data);
> + Xfree (data);
> return False;
> }
>
> diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
> index 63bb2db..6326c8d 100644
> --- a/src/xkb/XKBGAlloc.c
> +++ b/src/xkb/XKBGAlloc.c
> @@ -177,8 +177,7 @@ _XkbClearColor(char *color_in)
> {
> XkbColorPtr color = (XkbColorPtr) color_in;
>
> - if (color->spec)
> - _XkbFree(color->spec);
> + _XkbFree(color->spec);
> return;
> }
>
> @@ -660,8 +659,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
> return NULL;
> for (i = 0, prop = geom->properties; i < geom->num_properties; i++, prop++) {
> if ((prop->name) && (strcmp(name, prop->name) == 0)) {
> - if (prop->value)
> - _XkbFree(prop->value);
> + _XkbFree(prop->value);
> prop->value = strdup(value);
> return prop;
> }
> diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
> index 2a1d0d6..8c1b4a0 100644
> --- a/src/xlibi18n/ICWrap.c
> +++ b/src/xlibi18n/ICWrap.c
> @@ -186,7 +186,7 @@ XSetIMValues(XIM im, ...)
> va_end(var);
>
> ret = (*im->methods->set_values) (im, args);
> - if (args) Xfree(args);
> + Xfree(args);
> return ret;
> }
>
> @@ -213,7 +213,7 @@ XGetIMValues(XIM im, ...)
> va_end(var);
>
> ret = (*im->methods->get_values) (im, args);
> - if (args) Xfree(args);
> + Xfree(args);
> return ret;
> }
>
> @@ -245,7 +245,7 @@ XCreateIC(XIM im, ...)
> va_end(var);
>
> ic = (XIC) (*im->methods->create_ic) (im, args);
> - if (args) Xfree(args);
> + Xfree(args);
> if (ic) {
> ic->core.next = im->core.ic_chain;
> im->core.ic_chain = ic;
> @@ -300,7 +300,7 @@ XGetICValues(XIC ic, ...)
> va_end(var);
>
> ret = (*ic->methods->get_values) (ic, args);
> - if (args) Xfree(args);
> + Xfree(args);
> return ret;
> }
>
> @@ -330,7 +330,7 @@ XSetICValues(XIC ic, ...)
> va_end(var);
>
> ret = (*ic->methods->set_values) (ic, args);
> - if (args) Xfree(args);
> + Xfree(args);
> return ret;
> }
>
> diff --git a/src/xlibi18n/XDefaultOMIF.c b/src/xlibi18n/XDefaultOMIF.c
> index a06f69a..1a707c8 100644
> --- a/src/xlibi18n/XDefaultOMIF.c
> +++ b/src/xlibi18n/XDefaultOMIF.c
> @@ -367,8 +367,8 @@ init_core_part(
> return True;
>
> err:
> - if (font_name_list)
> - Xfree(font_name_list);
> +
> + Xfree(font_name_list);
> Xfree(font_struct_list);
>
> return False;
> @@ -636,14 +636,10 @@ destroy_oc(
> XOCGenericPart *gen = XOC_GENERIC(oc);
> 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)
> - XFreeStringList(oc->core.font_info.font_name_list);
> + Xfree(gen->font_set);
> + 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 = *font_list)) {
> @@ -655,14 +651,12 @@ destroy_oc(
> 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
> - if (oc->core.res_name)
> - Xfree(oc->core.res_name);
> - if (oc->core.res_class)
> - Xfree(oc->core.res_class);
> + Xfree(oc->core.res_name);
> + Xfree(oc->core.res_class);
> #endif
>
> Xfree(oc);
> @@ -1043,7 +1037,6 @@ close_om(
> if (data->font_data) {
> for (font_data = data->font_data, count = data->font_data_count;
> count-- > 0 ; font_data++) {
> - if (font_data->name)
> Xfree(font_data->name);
> }
> Xfree(data->font_data);
> @@ -1051,17 +1044,16 @@ close_om(
> Xfree(gen->data);
> }
>
> - if (om->core.res_name)
> - Xfree(om->core.res_name);
> - if (om->core.res_class)
> - Xfree(om->core.res_class);
> +
> + Xfree(om->core.res_name);
> + Xfree(om->core.res_class);
> +
> if (om->core.required_charset.charset_list)
> XFreeStringList(om->core.required_charset.charset_list);
> else
> 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);
>
> return 1;
> diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
> index bf89084..ca5a7a5 100644
> --- a/src/xlibi18n/lcFile.c
> +++ b/src/xlibi18n/lcFile.c
> @@ -554,7 +554,7 @@ _XlcResolveLocaleName(
> break;
> }
> }
> - if (nlc_name) Xfree(nlc_name);
> + Xfree(nlc_name);
>
> if (name == NULL) {
> /* 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)
> target_name = NULL;
> }
> }
> - if (nlc_name) Xfree(nlc_name);
> + Xfree(nlc_name);
>
> if (target_name == NULL)
> /* vendor locale name == Xlocale name, no expansion of alias */
> snprintf(dir_name, dir_len, "%s/%s", args[0], lc_name);
> else
> 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_name = Xmalloc (last_dir_len);
> strcpy (last_dir_name, dir_name);
> @@ -751,7 +750,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, const char *lc_name)
> target_name = NULL;
> }
> }
> - if (nlc_name) Xfree(nlc_name);
> + Xfree(nlc_name);
>
> if (target_name == NULL)
> /* 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)
> else
> snprintf(dir_name, dir_len, "%s/%s", target_dir, 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_name = Xmalloc (last_dir_len);
> strcpy (last_dir_name, dir_name);
> diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c
> index 20c455c..138936f 100644
> --- a/src/xlibi18n/lcGeneric.c
> +++ b/src/xlibi18n/lcGeneric.c
> @@ -259,8 +259,8 @@ add_parse_list(
>
> err:
> Xfree(str);
> - if (new)
> - Xfree(new);
> +
> + Xfree(new);
>
> return False;
> }
> @@ -273,12 +273,10 @@ free_charset(
> ParseInfo *parse_info;
> 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) {
> 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(gen->mb_parse_list);
> diff --git a/src/xlibi18n/lcPrTxt.c b/src/xlibi18n/lcPrTxt.c
> index 47d11f0..72fc2b9 100644
> --- a/src/xlibi18n/lcPrTxt.c
> +++ b/src/xlibi18n/lcPrTxt.c
> @@ -283,8 +283,7 @@ _XwcFreeStringList(
> wchar_t **list)
> {
> if (list) {
> - if (*list)
> - Xfree(*list);
> + Xfree(*list);
> Xfree(list);
> }
> }
> diff --git a/src/xlibi18n/lcPublic.c b/src/xlibi18n/lcPublic.c
> index 39ec082..bb3a505 100644
> --- a/src/xlibi18n/lcPublic.c
> +++ b/src/xlibi18n/lcPublic.c
> @@ -254,16 +254,16 @@ static void
> destroy_core(
> XLCd lcd)
> {
> + if (lcd) {
> +
> if (lcd->core) {
> - if (lcd->core->name)
> - Xfree(lcd->core->name);
> + Xfree(lcd->core->name);
> Xfree(lcd->core);
> }
>
> - if (lcd->methods)
> - Xfree(lcd->methods);
> -
> - Xfree(lcd);
> + Xfree(lcd->methods);
> + Xfree(lcd);
> + }
> }
>
> static void
> @@ -274,10 +274,8 @@ destroy(
>
> _XlcDestroyLocaleDataBase(lcd);
>
> - if (pub->siname)
> - Xfree(pub->siname);
> - if (pub->encoding_name)
> - Xfree(pub->encoding_name);
> + Xfree(pub->siname);
> + Xfree(pub->encoding_name);
>
> destroy_core(lcd);
> }
> diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
> index 034bd3c..95e5328 100644
> --- a/src/xlibi18n/lcWrap.c
> +++ b/src/xlibi18n/lcWrap.c
> @@ -86,8 +86,7 @@ XSetLocaleModifiers(
> user_mods = getenv("XMODIFIERS");
> mapped_mods = (*lcd->methods->map_modifiers) (lcd, user_mods, modifiers);
> if (mapped_mods) {
> - if (lcd->core->modifiers)
> - Xfree(lcd->core->modifiers);
> + Xfree(lcd->core->modifiers);
> lcd->core->modifiers = mapped_mods;
> }
> return mapped_mods;
> --
> 1.8.4.5
More information about the xorg-devel
mailing list