SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-12 14:44:09 +02:00
parent 2d1e52c274
commit b5b25afdb8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
657 changed files with 21464 additions and 54675 deletions
Download patch file Download diff file Expand all files Collapse all files

119
lib/libX11/modules/im/ximcp/imDefIm.c
View file

@ -1,5 +1,5 @@
/*
* Copyright 1990, 1991, 1992 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1990, 1991, 1992, Oracle and/or its affiliates.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -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;
}