diff options
author | Walter Harms <wharms@bfs.de> | 2024-01-08 17:18:19 +0100 |
---|---|---|
committer | Walter Harms <wharms@bfs.de> | 2024-01-08 17:18:19 +0100 |
commit | 0a951047f64e87c5ab328084310bf27bcd4964f3 (patch) | |
tree | 1f5f7b80695d632a279b50eccdb26d8c64d84b05 /modules | |
parent | dce614623e1f069d79d33a233305e0754fa2fd48 (diff) |
_XimProtoIMFree:no need to check arg for Xfree()
Xfree() will happily ignore NULL, no need to check
Diffstat (limited to 'modules')
-rw-r--r-- | modules/im/ximcp/imDefIm.c | 117 |
1 files changed, 51 insertions, 66 deletions
diff --git a/modules/im/ximcp/imDefIm.c b/modules/im/ximcp/imDefIm.c index 242287d1..fe4d18ba 100644 --- a/modules/im/ximcp/imDefIm.c +++ b/modules/im/ximcp/imDefIm.c @@ -980,34 +980,30 @@ _XimProtoIMFree( Xim im) { /* XIMPrivateRec */ - if (im->private.proto.im_onkeylist) { - Xfree(im->private.proto.im_onkeylist); - im->private.proto.im_onkeylist = NULL; - } - if (im->private.proto.im_offkeylist) { - Xfree(im->private.proto.im_offkeylist); - im->private.proto.im_offkeylist = NULL; - } + + Xfree(im->private.proto.im_onkeylist); + im->private.proto.im_onkeylist = NULL; + + Xfree(im->private.proto.im_offkeylist); + im->private.proto.im_offkeylist = NULL; + if (im->private.proto.intrproto) { - _XimFreeProtoIntrCallback(im); - im->private.proto.intrproto = NULL; - } - if (im->private.proto.im_inner_resources) { - Xfree(im->private.proto.im_inner_resources); - im->private.proto.im_inner_resources = NULL; - } - if (im->private.proto.ic_inner_resources) { - Xfree(im->private.proto.ic_inner_resources); - im->private.proto.ic_inner_resources = NULL; - } - if (im->private.proto.hold_data) { - Xfree(im->private.proto.hold_data); - im->private.proto.hold_data = NULL; - } - if (im->private.proto.locale_name) { - Xfree(im->private.proto.locale_name); - im->private.proto.locale_name = NULL; + _XimFreeProtoIntrCallback(im); + im->private.proto.intrproto = NULL; } + + Xfree(im->private.proto.im_inner_resources); + im->private.proto.im_inner_resources = NULL; + + Xfree(im->private.proto.ic_inner_resources); + im->private.proto.ic_inner_resources = NULL; + + Xfree(im->private.proto.hold_data); + im->private.proto.hold_data = NULL; + + Xfree(im->private.proto.locale_name); + im->private.proto.locale_name = NULL; + if (im->private.proto.ctom_conv) { _XlcCloseConverter(im->private.proto.ctom_conv); im->private.proto.ctom_conv = NULL; @@ -1047,48 +1043,37 @@ _XimProtoIMFree( } #endif /* XIM_CONNECTABLE */ - if (im->private.proto.saved_imvalues) { - Xfree(im->private.proto.saved_imvalues); - im->private.proto.saved_imvalues = NULL; - } - if (im->private.proto.default_styles) { - Xfree(im->private.proto.default_styles); - im->private.proto.default_styles = NULL; - } + Xfree(im->private.proto.saved_imvalues); + im->private.proto.saved_imvalues = NULL; + + Xfree(im->private.proto.default_styles); + im->private.proto.default_styles = NULL; /* core */ - if (im->core.res_name) { - Xfree(im->core.res_name); - im->core.res_name = NULL; - } - if (im->core.res_class) { - Xfree(im->core.res_class); - im->core.res_class = NULL; - } - if (im->core.im_values_list) { - Xfree(im->core.im_values_list); - im->core.im_values_list = NULL; - } - if (im->core.ic_values_list) { - Xfree(im->core.ic_values_list); - im->core.ic_values_list = NULL; - } - if (im->core.im_name) { - Xfree(im->core.im_name); - im->core.im_name = NULL; - } - if (im->core.styles) { - Xfree(im->core.styles); - im->core.styles = NULL; - } - if (im->core.im_resources) { - Xfree(im->core.im_resources); - im->core.im_resources = NULL; - } - if (im->core.ic_resources) { - Xfree(im->core.ic_resources); - im->core.ic_resources = NULL; - } + + Xfree(im->core.res_name); + im->core.res_name = NULL; + + Xfree(im->core.res_class); + im->core.res_class = NULL; + + Xfree(im->core.im_values_list); + im->core.im_values_list = NULL; + + Xfree(im->core.ic_values_list); + im->core.ic_values_list = NULL; + + Xfree(im->core.im_name); + im->core.im_name = NULL; + + Xfree(im->core.styles); + im->core.styles = NULL; + + Xfree(im->core.im_resources); + im->core.im_resources = NULL; + + Xfree(im->core.ic_resources); + im->core.ic_resources = NULL; return; } |