diff options
Diffstat (limited to 'libX11')
34 files changed, 198 insertions, 255 deletions
diff --git a/libX11/modules/im/ximcp/imCallbk.c b/libX11/modules/im/ximcp/imCallbk.c index 07921f8a1..4e091d8ef 100644 --- a/libX11/modules/im/ximcp/imCallbk.c +++ b/libX11/modules/im/ximcp/imCallbk.c @@ -553,10 +553,8 @@ static void _free_memory_for_text(XIMText* text) { if (text) { - if (text->string.multi_byte) - Xfree(text->string.multi_byte); - if (text->feedback) - Xfree(text->feedback); + Xfree(text->string.multi_byte); + Xfree(text->feedback); Xfree(text); } } diff --git a/libX11/modules/im/ximcp/imDefIc.c b/libX11/modules/im/ximcp/imDefIc.c index 9610a0f11..143bd5942 100644 --- a/libX11/modules/im/ximcp/imDefIc.c +++ b/libX11/modules/im/ximcp/imDefIc.c @@ -1595,10 +1595,9 @@ _XimProtoCreateIC( ErrorOnCreatingIC: _XimUnregisterFilter(ic); - if (ic->private.proto.ic_resources) - Xfree(ic->private.proto.ic_resources); - if (ic->private.proto.ic_inner_resources) - Xfree(ic->private.proto.ic_inner_resources); + + Xfree(ic->private.proto.ic_resources); + Xfree(ic->private.proto.ic_inner_resources); Xfree(ic); return (XIC)NULL; } diff --git a/libX11/modules/im/ximcp/imDefIm.c b/libX11/modules/im/ximcp/imDefIm.c index 9168135e1..9e877c0b4 100644 --- a/libX11/modules/im/ximcp/imDefIm.c +++ b/libX11/modules/im/ximcp/imDefIm.c @@ -1775,10 +1775,8 @@ _XimEncodingNegotiation( detail_ptr, detail_len))) goto free_preply; - if (name_ptr) - Xfree(name_ptr); - if (detail_ptr) - Xfree(detail_ptr); + Xfree(name_ptr); + Xfree(detail_ptr); if(reply != preply) Xfree(preply); diff --git a/libX11/modules/im/ximcp/imDefLkup.c b/libX11/modules/im/ximcp/imDefLkup.c index e88123493..dea7f66d5 100644 --- a/libX11/modules/im/ximcp/imDefLkup.c +++ b/libX11/modules/im/ximcp/imDefLkup.c @@ -599,10 +599,9 @@ _XimUnregCommitInfo( if (!(info = ic->private.proto.commit_info)) return; - if (info->string) - Xfree(info->string); - if (info->keysym) - Xfree(info->keysym); + + Xfree(info->string); + Xfree(info->keysym); ic->private.proto.commit_info = info->next; Xfree(info); return; @@ -696,10 +695,8 @@ _XimCommitRecv( } if (!(_XimRegCommitInfo(ic, string, string_len, keysym, keysym_len))) { - if (string) - Xfree(string); - if (keysym) - Xfree(keysym); + Xfree(string); + Xfree(keysym); _XimError(im, ic, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL); return False; } diff --git a/libX11/modules/im/ximcp/imInt.c b/libX11/modules/im/ximcp/imInt.c index ee9f45122..bb393e0e4 100644 --- a/libX11/modules/im/ximcp/imInt.c +++ b/libX11/modules/im/ximcp/imInt.c @@ -239,14 +239,11 @@ Error4 : Xfree(im); return NULL; Error3 : - if(im->core.im_name) - Xfree(im->core.im_name); + Xfree(im->core.im_name); Error2: - if(im->core.res_class) - Xfree(im->core.res_class); + Xfree(im->core.res_class); Error1: - if(im->core.res_name) - Xfree(im->core.res_name); + Xfree(im->core.res_name); Xfree(im); return NULL; } diff --git a/libX11/modules/im/ximcp/imLcIm.c b/libX11/modules/im/ximcp/imLcIm.c index 3ab2dfc16..f3678868c 100644 --- a/libX11/modules/im/ximcp/imLcIm.c +++ b/libX11/modules/im/ximcp/imLcIm.c @@ -131,13 +131,14 @@ XimFreeDefaultTree( } #endif Xfree (b->tree); - if (b->mb) Xfree (b->mb); - if (b->wc) Xfree (b->wc); - if (b->utf8) Xfree (b->utf8); b->tree = NULL; + Xfree (b->mb); b->mb = NULL; + Xfree (b->wc); b->wc = NULL; + Xfree (b->utf8); b->utf8 = NULL; + b->treeused = b->treesize = 0; b->mbused = b->mbsize = 0; b->wcused = b->wcsize = 0; @@ -151,38 +152,30 @@ _XimLocalIMFree( XimFreeDefaultTree(&im->private.local.base); im->private.local.top = 0; - 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; - } - 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.styles) { - Xfree(im->core.styles); - im->core.styles = NULL; - } - 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_name) { - Xfree(im->core.im_name); - im->core.im_name = NULL; - } + Xfree(im->core.im_resources); + im->core.im_resources = NULL; + + Xfree(im->core.ic_resources); + im->core.ic_resources = 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.styles); + im->core.styles = 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_name); + im->core.im_name = NULL; + if (im->private.local.ctom_conv) { _XlcCloseConverter(im->private.local.ctom_conv); im->private.local.ctom_conv = NULL; @@ -576,19 +569,15 @@ _XimCreateDefaultTree( encoding, 0, 1, &cachename, &size); if (cachefd != -1) { if (_XimLoadCache (cachefd, intname, encoding, size, im)) { - if (tmpcachedir) - Xfree (tmpcachedir); - if (tmpname) - Xfree (tmpname); - if (cachename) - Xfree (cachename); + Xfree (tmpcachedir); + Xfree (tmpname); + Xfree (cachename); close (cachefd); return; } close (cachefd); } - if (cachename) - Xfree (cachename); + Xfree (cachename); cachename = NULL; } @@ -603,12 +592,9 @@ _XimCreateDefaultTree( euid, 0, &cachename, &size); if (cachefd != -1) { if (_XimLoadCache (cachefd, intname, encoding, size, im)) { - if (tmpcachedir) - Xfree (tmpcachedir); - if (tmpname) - Xfree (tmpname); - if (cachename) - Xfree (cachename); + Xfree (tmpcachedir); + Xfree (tmpname); + Xfree (cachename); close (cachefd); return; } @@ -618,12 +604,9 @@ _XimCreateDefaultTree( #endif if (! (fp = _XFopenFile (name, "r"))) { - if (tmpcachedir) - Xfree (tmpcachedir); - if (tmpname) - Xfree (tmpname); - if (cachename) - Xfree (cachename); + Xfree (tmpcachedir); + Xfree (tmpname); + Xfree (cachename); return; } _XimParseStringFile(fp, im); @@ -636,12 +619,9 @@ _XimCreateDefaultTree( } #endif - if (tmpcachedir) - Xfree (tmpcachedir); - if (tmpname) - Xfree (tmpname); - if (cachename) - Xfree (cachename); + Xfree (tmpcachedir); + Xfree (tmpname); + Xfree (cachename); } static XIMMethodsRec Xim_im_local_methods = { diff --git a/libX11/modules/im/ximcp/imRmAttr.c b/libX11/modules/im/ximcp/imRmAttr.c index ad5290ee5..9d4e46258 100644 --- a/libX11/modules/im/ximcp/imRmAttr.c +++ b/libX11/modules/im/ximcp/imRmAttr.c @@ -972,8 +972,7 @@ _XimEncodePreeditValue( if (!p->value) return False; - if (ic->private.proto.preedit_font) - Xfree(ic->private.proto.preedit_font); + Xfree(ic->private.proto.preedit_font); list_ret = XFontsOfFontSet((XFontSet)p->value, &struct_list, &name_list); @@ -1024,8 +1023,7 @@ _XimEncodeStatusValue( if (!p->value) return False; - if (ic->private.proto.status_font) - Xfree(ic->private.proto.status_font); + Xfree(ic->private.proto.status_font); list_ret = XFontsOfFontSet((XFontSet)p->value, &struct_list, &name_list); @@ -1243,8 +1241,7 @@ _XimEncodeSavedStatusValue( if (!value) return False; - if (ic->private.proto.status_font) - Xfree(ic->private.proto.status_font); + Xfree(ic->private.proto.status_font); list_ret = XFontsOfFontSet((XFontSet)value, &struct_list, &name_list); @@ -1460,10 +1457,9 @@ _XimGetAttributeID( } _XIMCompileResourceList(res, n); - if (im->core.im_resources) - Xfree(im->core.im_resources); - if (im->core.im_values_list) - Xfree(im->core.im_values_list); + Xfree(im->core.im_resources); + Xfree(im->core.im_values_list); + im->core.im_resources = res; im->core.im_num_resources = n; im->core.im_values_list = values_list; @@ -1506,10 +1502,10 @@ _XimGetAttributeID( } _XIMCompileResourceList(res, n); - if (im->core.ic_resources) - Xfree(im->core.ic_resources); - if (im->core.ic_values_list) - Xfree(im->core.ic_values_list); + + Xfree(im->core.ic_resources); + Xfree(im->core.ic_values_list); + im->core.ic_resources = res; im->core.ic_num_resources = n; im->core.ic_values_list = values_list; diff --git a/libX11/modules/im/ximcp/imThaiIc.c b/libX11/modules/im/ximcp/imThaiIc.c index 90da143f6..313734072 100644 --- a/libX11/modules/im/ximcp/imThaiIc.c +++ b/libX11/modules/im/ximcp/imThaiIc.c @@ -65,18 +65,20 @@ _XimThaiDestroyIC( if(((Xim)ic->core.im)->private.local.current_ic == (XIC)ic) { _XimThaiUnSetFocus(xic); } - if(ic->private.local.ic_resources) { - Xfree(ic->private.local.ic_resources); - ic->private.local.ic_resources = NULL; - } - if (b->tree) Xfree (b->tree); - if (b->mb) Xfree (b->mb); - if (b->wc) Xfree (b->wc); - if (b->utf8) Xfree (b->utf8); + Xfree(ic->private.local.ic_resources); + ic->private.local.ic_resources = NULL; + + Xfree (b->tree); b->tree = NULL; + + Xfree (b->mb); b->mb = NULL; + + Xfree (b->wc); b->wc = NULL; + + Xfree (b->utf8); b->utf8 = NULL; return; } diff --git a/libX11/modules/lc/def/lcDefConv.c b/libX11/modules/lc/def/lcDefConv.c index 3cd5c22c9..e1f02289b 100644 --- a/libX11/modules/lc/def/lcDefConv.c +++ b/libX11/modules/lc/def/lcDefConv.c @@ -563,9 +563,8 @@ static void close_converter( XlcConv conv) { - if (conv->state) - Xfree(conv->state); + Xfree(conv->state); Xfree(conv); } diff --git a/libX11/modules/lc/gen/lcGenConv.c b/libX11/modules/lc/gen/lcGenConv.c index 1f7c301f5..eede76807 100644 --- a/libX11/modules/lc/gen/lcGenConv.c +++ b/libX11/modules/lc/gen/lcGenConv.c @@ -753,7 +753,7 @@ mbstowcs_org( CodeSet codeset = NULL; - const char *inbufptr = *from; + const char *inbufptr; wchar_t *outbufptr = (wchar_t *) *to; int from_size = *from_left; @@ -764,6 +764,8 @@ mbstowcs_org( return( 0 ); } + inbufptr = *from; + while (*from_left && *to_left) { ch = *inbufptr++; @@ -1223,8 +1225,7 @@ stdc_wcstocts( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1252,7 +1253,7 @@ ctstowcs( CodeSet codeset = NULL; XlcCharSet charset_tmp; - const char *inbufptr = *from; + const char *inbufptr; wchar_t *outbufptr = (wchar_t *) *to; int from_size = *from_left; @@ -1262,6 +1263,7 @@ ctstowcs( _XlcResetConverter(conv); return( 0 ); } + inbufptr = *from; while (*from_left && *to_left) { @@ -1437,7 +1439,7 @@ cstowcs( CodeSet codeset = NULL; XlcCharSet charset, charset_tmp; - const char *inbufptr = *from; + const char *inbufptr; wchar_t *outbufptr = (wchar_t *) *to; int from_size = *from_left; @@ -1445,6 +1447,8 @@ cstowcs( return( 0 ); } + inbufptr = *from; + charset = (XlcCharSet) args[0]; while (*from_left && *to_left) { @@ -1543,8 +1547,7 @@ stdc_ctstowcs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1579,8 +1582,7 @@ stdc_cstowcs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1615,8 +1617,7 @@ mbstocts( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1643,7 +1644,7 @@ mbstostr( CodeSet codeset = NULL; - const char *inbufptr = *from; + const char *inbufptr; char *outbufptr = *to; int from_size = *from_left; @@ -1654,6 +1655,8 @@ mbstostr( return( 0 ); } + inbufptr = *from; + while (*from_left && *to_left) { ch = *inbufptr++; @@ -1758,7 +1761,7 @@ mbtocs( CodeSet codeset = NULL; XlcCharSet charset = NULL; - const char *inbufptr = *from; + const char *inbufptr; char *outbufptr = *to; int from_size = *from_left; @@ -1769,6 +1772,8 @@ mbtocs( return( 0 ); } + inbufptr = *from; + while (*from_left && *to_left) { ch = *inbufptr++; @@ -2062,8 +2067,7 @@ stdc_wcstostr( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2337,8 +2341,7 @@ ctstombs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2373,8 +2376,7 @@ cstombs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2582,8 +2584,7 @@ stdc_strtowcs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2596,14 +2597,8 @@ static void close_converter( XlcConv conv) { - if (conv->state) { - Xfree(conv->state); - } - - if (conv->methods) { - Xfree(conv->methods); - } - + Xfree(conv->state); + Xfree(conv->methods); Xfree(conv); } diff --git a/libX11/modules/om/generic/omGeneric.c b/libX11/modules/om/generic/omGeneric.c index 0d202c0f6..a835f00d7 100644 --- a/libX11/modules/om/generic/omGeneric.c +++ b/libX11/modules/om/generic/omGeneric.c @@ -196,16 +196,12 @@ init_fontset( return True; err: - if(font_set->font_data) - Xfree(font_set->font_data); - if(font_set->substitute) - Xfree(font_set->substitute); - if(font_set->vmap) - Xfree(font_set->vmap); - if(font_set->vrotate) - Xfree(font_set->vrotate); - if(font_set) - Xfree(font_set); + + Xfree(font_set->font_data); + Xfree(font_set->substitute); + Xfree(font_set->vmap); + Xfree(font_set->vrotate); + Xfree(font_set); gen->font_set = (FontSet) NULL; gen->font_set_num = 0; return False; @@ -504,8 +500,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; @@ -1486,24 +1482,15 @@ destroy_oc( */ /* For VW/UDC end */ - 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); - - if (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); + Xfree(oc->core.base_name_list); + XFreeStringList(oc->core.font_info.font_name_list); + Xfree(oc->core.font_info.font_struct_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); diff --git a/libX11/src/FetchName.c b/libX11/src/FetchName.c index 8605a6dfc..160eb5bd6 100644 --- a/libX11/src/FetchName.c +++ b/libX11/src/FetchName.c @@ -58,7 +58,7 @@ Status XFetchName ( *name = (char *)data; return(1); } - if (data) Xfree (data); + Xfree (data); *name = NULL; return(0); } @@ -89,7 +89,7 @@ Status XGetIconName ( *icon_name = (char*)data; return(1); } - if (data) Xfree (data); + Xfree (data); *icon_name = NULL; return(0); } diff --git a/libX11/src/Font.c b/libX11/src/Font.c index 6fadd5877..650bc6f69 100644 --- a/libX11/src/Font.c +++ b/libX11/src/Font.c @@ -170,8 +170,8 @@ XFreeFont( #endif } _XFreeExtData(fs->ext_data); - if (fs->properties) - Xfree (fs->properties); + + Xfree (fs->properties); Xfree (fs); return 1; } @@ -271,7 +271,7 @@ _XQueryFont ( } } if (! fs->per_char) { - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); _XEatDataWords(dpy, reply_left); return (XFontStruct *)NULL; @@ -524,14 +524,14 @@ _XF86BigfontQueryFont ( + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16); pUniqCI = Xmalloc (nbytes); if (!pUniqCI) { - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); _XEatDataWords(dpy, reply_left); return (XFontStruct *)NULL; } if (! (fs->per_char = Xmalloc (reply.nCharInfos * sizeof(XCharStruct)))) { Xfree(pUniqCI); - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); _XEatDataWords(dpy, reply_left); return (XFontStruct *)NULL; @@ -542,7 +542,7 @@ _XF86BigfontQueryFont ( if (pIndex2UniqIndex[i] >= reply.nUniqCharInfos) { fprintf(stderr, "_XF86BigfontQueryFont: server returned wrong data\n"); Xfree(pUniqCI); - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); return (XFontStruct *)NULL; } @@ -558,7 +558,7 @@ _XF86BigfontQueryFont ( pData = Xmalloc(sizeof(XExtData)); if (!pData) { - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); return (XFontStruct *)NULL; } @@ -578,7 +578,7 @@ _XF86BigfontQueryFont ( if (extcodes->serverCapabilities & CAP_VerifiedLocal) fprintf(stderr, "_XF86BigfontQueryFont: could not attach shm segment\n"); Xfree(pData); - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); /* Stop requesting shared memory transport from now on. */ extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm; @@ -593,7 +593,7 @@ _XF86BigfontQueryFont ( && *(CARD32 *)(addr + reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct)) == extcodes->serverSignature)) { shmdt(addr); Xfree(pData); - if (fs->properties) Xfree(fs->properties); + Xfree(fs->properties); Xfree(fs); /* Stop requesting shared memory transport from now on. */ extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm; @@ -697,8 +697,8 @@ int _XF86LoadQueryLocaleFont( #endif } _XFreeExtData(fs->ext_data); - if (fs->properties) - Xfree (fs->properties); + + Xfree (fs->properties); *fidp = fs->fid; Xfree (fs); } else { diff --git a/libX11/src/FontInfo.c b/libX11/src/FontInfo.c index 763aafb3d..a2d12c2ec 100644 --- a/libX11/src/FontInfo.c +++ b/libX11/src/FontInfo.c @@ -179,8 +179,8 @@ XFontStruct **info) /* RETURN */ Xfree(flist[j]); if (finfo[j].properties) Xfree(finfo[j].properties); } - if (flist) Xfree(flist); - if (finfo) Xfree(finfo); + Xfree(flist); + Xfree(finfo); clearwire: /* Clear the wire. */ diff --git a/libX11/src/FontNames.c b/libX11/src/FontNames.c index c50de2eeb..6fc6b1272 100644 --- a/libX11/src/FontNames.c +++ b/libX11/src/FontNames.c @@ -73,8 +73,8 @@ int *actualCount) /* RETURN */ } if ((! flist) || (! ch)) { - if (flist) Xfree(flist); - if (ch) Xfree(ch); + Xfree(flist); + Xfree(ch); _XEatDataWords(dpy, rep.length); *actualCount = 0; UnlockDisplay(dpy); diff --git a/libX11/src/GetFPath.c b/libX11/src/GetFPath.c index 76ff7327b..62ba01436 100644 --- a/libX11/src/GetFPath.c +++ b/libX11/src/GetFPath.c @@ -57,8 +57,8 @@ char **XGetFontPath( } if ((! flist) || (! ch)) { - if (flist) Xfree(flist); - if (ch) Xfree(ch); + Xfree(flist); + Xfree(ch); _XEatDataWords(dpy, rep.length); UnlockDisplay(dpy); SyncHandle(); diff --git a/libX11/src/GetHints.c b/libX11/src/GetHints.c index 5cca0bc93..513b4b090 100644 --- a/libX11/src/GetHints.c +++ b/libX11/src/GetHints.c @@ -75,7 +75,7 @@ Status XGetSizeHints ( if ((actual_type != XA_WM_SIZE_HINTS) || (nitems < OldNumPropSizeElements) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return(0); } hints->flags = (prop->flags & (USPosition|USSize|PAllHints)); @@ -124,7 +124,7 @@ XWMHints *XGetWMHints ( if ((actual_type != XA_WM_HINTS) || (nitems < (NumPropWMHintsElements - 1)) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return(NULL); } /* static copies not allowed in library, due to reentrancy constraint*/ @@ -196,7 +196,7 @@ Status XGetIconSizes ( (nitems < NumPropIconSizeElements) || (nitems % NumPropIconSizeElements != 0) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return(0); } @@ -204,7 +204,7 @@ Status XGetIconSizes ( nitems /= NumPropIconSizeElements; if (! (hp = hints = Xcalloc (nitems, sizeof(XIconSize)))) { - if (prop) Xfree (prop); + Xfree (prop); return 0; } @@ -239,7 +239,7 @@ Status XGetCommand ( if (!XGetTextProperty (dpy, w, &tp, XA_WM_COMMAND)) return 0; if (tp.encoding != XA_STRING || tp.format != 8) { - if (tp.value) Xfree (tp.value); + Xfree (tp.value); return 0; } @@ -254,7 +254,7 @@ Status XGetCommand ( * create a string list and return if successful */ if (!XTextPropertyToStringList (&tp, &argv, &argc)) { - if (tp.value) Xfree (tp.value); + Xfree (tp.value); return (0); } @@ -291,7 +291,7 @@ XGetTransientForHint( return (1); } *propWindow = None; - if (data) Xfree( (char *) data); + Xfree( (char *) data); return(0); } @@ -333,6 +333,6 @@ XGetClassHint( Xfree( (char *) data); return(1); } - if (data) Xfree( (char *) data); + Xfree( (char *) data); return(0); } diff --git a/libX11/src/GetNrmHint.c b/libX11/src/GetNrmHint.c index 5e4143b28..97f04b23b 100644 --- a/libX11/src/GetNrmHint.c +++ b/libX11/src/GetNrmHint.c @@ -83,7 +83,7 @@ Status XGetWMSizeHints ( if ((actual_type != XA_WM_SIZE_HINTS) || (nitems < OldNumPropSizeElements) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return False; } diff --git a/libX11/src/GetRGBCMap.c b/libX11/src/GetRGBCMap.c index d8a1b3f05..5d570ad3a 100644 --- a/libX11/src/GetRGBCMap.c +++ b/libX11/src/GetRGBCMap.c @@ -63,7 +63,7 @@ Status XGetRGBColormaps ( /* if wrong type or format, or too small for us, then punt */ if ((actual_type != XA_RGB_COLOR_MAP) || (actual_format != 32) || (nitems < OldNumPropStandardColormapElements)) { - if (data) Xfree (data); + Xfree (data); return False; } @@ -78,7 +78,7 @@ Status XGetRGBColormaps ( Screen *sp = _XScreenOfWindow (dpy, w); if (!sp) { - if (data) Xfree (data); + Xfree (data); return False; } def_visual = sp->root_visual->visualid; @@ -90,7 +90,7 @@ Status XGetRGBColormaps ( ncmaps = (nitems / NumPropStandardColormapElements); if ((((unsigned long) ncmaps) * NumPropStandardColormapElements) != nitems) { - if (data) Xfree (data); + Xfree (data); return False; } } @@ -101,7 +101,7 @@ Status XGetRGBColormaps ( */ cmaps = Xmalloc (ncmaps * sizeof (XStandardColormap)); if (!cmaps) { - if (data) Xfree (data); + Xfree (data); return False; } diff --git a/libX11/src/GetStCmap.c b/libX11/src/GetStCmap.c index ac5b0fa88..1cb1e0f01 100644 --- a/libX11/src/GetStCmap.c +++ b/libX11/src/GetStCmap.c @@ -81,7 +81,7 @@ Status XGetStandardColormap ( int i; if (!sp) { - if (stdcmaps) Xfree (stdcmaps); + Xfree (stdcmaps); return False; } vid = sp->root_visual->visualid; diff --git a/libX11/src/GetWMCMapW.c b/libX11/src/GetWMCMapW.c index 27f1e232c..d3ef1fea0 100644 --- a/libX11/src/GetWMCMapW.c +++ b/libX11/src/GetWMCMapW.c @@ -77,7 +77,7 @@ Status XGetWMColormapWindows ( return False; if (actual_type != XA_WINDOW || actual_format != 32) { - if (data) Xfree (data); + Xfree (data); return False; } diff --git a/libX11/src/ImUtil.c b/libX11/src/ImUtil.c index 4fc060cb8..0d996e8ec 100644 --- a/libX11/src/ImUtil.c +++ b/libX11/src/ImUtil.c @@ -434,8 +434,8 @@ Status XInitImage (XImage *image) static int _XDestroyImage (XImage *ximage) { - if (ximage->data != NULL) Xfree(ximage->data); - if (ximage->obdata != NULL) Xfree(ximage->obdata); + Xfree(ximage->data); + Xfree(ximage->obdata); Xfree(ximage); return 1; } diff --git a/libX11/src/InitExt.c b/libX11/src/InitExt.c index 0ff3732bf..4de46f157 100644 --- a/libX11/src/InitExt.c +++ b/libX11/src/InitExt.c @@ -51,7 +51,7 @@ XExtCodes *XInitExtension ( LockDisplay (dpy); if (! (ext = Xcalloc (1, sizeof (_XExtension))) || ! (ext->name = strdup(name))) { - if (ext) Xfree(ext); + Xfree(ext); UnlockDisplay(dpy); return (XExtCodes *) NULL; } diff --git a/libX11/src/KeyBind.c b/libX11/src/KeyBind.c index f64f116b8..d7c78b37e 100644 --- a/libX11/src/KeyBind.c +++ b/libX11/src/KeyBind.c @@ -271,12 +271,13 @@ _XKeyInitialize( if (! keysyms) return 0; LockDisplay(dpy); - if (dpy->keysyms) - Xfree (dpy->keysyms); + + Xfree (dpy->keysyms); dpy->keysyms = keysyms; dpy->keysyms_per_keycode = per; if (dpy->modifiermap) ResetModMap(dpy); + UnlockDisplay(dpy); } if (!dpy->modifiermap) @@ -929,8 +930,8 @@ XRebindKeysym ( ((! (p->string = Xmalloc(nbytes))) && (nbytes > 0)) || ((! (p->modifiers = Xmalloc(nb))) && (nb > 0))) { if (p) { - if (p->string) Xfree(p->string); - if (p->modifiers) Xfree(p->modifiers); + Xfree(p->string); + Xfree(p->modifiers); Xfree(p); } UnlockDisplay(dpy); diff --git a/libX11/src/ListExt.c b/libX11/src/ListExt.c index f40924df7..431ae6784 100644 --- a/libX11/src/ListExt.c +++ b/libX11/src/ListExt.c @@ -62,8 +62,8 @@ char **XListExtensions( } if ((!list) || (!ch)) { - if (list) Xfree(list); - if (ch) Xfree(ch); + Xfree(list); + Xfree(ch); _XEatDataWords(dpy, rep.length); UnlockDisplay(dpy); SyncHandle(); diff --git a/libX11/src/ModMap.c b/libX11/src/ModMap.c index 78d635bf5..a809aa291 100644 --- a/libX11/src/ModMap.c +++ b/libX11/src/ModMap.c @@ -50,7 +50,7 @@ XGetModifierMapping(register Display *dpy) } else res = NULL; if ((! res) || (! res->modifiermap)) { - if (res) Xfree(res); + Xfree(res); res = (XModifierKeymap *) NULL; _XEatDataWords(dpy, rep.length); } else { @@ -114,8 +114,7 @@ int XFreeModifiermap(XModifierKeymap *map) { if (map) { - if (map->modifiermap) - Xfree(map->modifiermap); + Xfree(map->modifiermap); Xfree(map); } return 1; diff --git a/libX11/src/OpenDis.c b/libX11/src/OpenDis.c index 379381489..636860e24 100644 --- a/libX11/src/OpenDis.c +++ b/libX11/src/OpenDis.c @@ -590,8 +590,7 @@ void _XFreeDisplayStructure(Display *dpy) while (dpy->ext_procs) { _XExtension *ext = dpy->ext_procs; dpy->ext_procs = ext->next; - if (ext->name) - Xfree (ext->name); + Xfree (ext->name); Xfree (ext); } if (dpy->im_filters) @@ -656,23 +655,17 @@ void _XFreeDisplayStructure(Display *dpy) } free(dpy->display_name); - if (dpy->vendor) - Xfree (dpy->vendor); - - if (dpy->buffer) - Xfree (dpy->buffer); - if (dpy->keysyms) - Xfree (dpy->keysyms); - if (dpy->xdefaults) - Xfree (dpy->xdefaults); - if (dpy->error_vec) - Xfree (dpy->error_vec); + + Xfree (dpy->vendor); + Xfree (dpy->buffer); + Xfree (dpy->keysyms); + Xfree (dpy->xdefaults); + Xfree (dpy->error_vec); _XFreeExtData (dpy->ext_data); - if (dpy->free_funcs) - Xfree (dpy->free_funcs); - if (dpy->scratch_buffer) - Xfree (dpy->scratch_buffer); + + Xfree (dpy->free_funcs); + Xfree (dpy->scratch_buffer); FreeDisplayLock(dpy); if (dpy->qfree) { @@ -687,8 +680,7 @@ void _XFreeDisplayStructure(Display *dpy) while (dpy->im_fd_info) { struct _XConnectionInfo *conni = dpy->im_fd_info; dpy->im_fd_info = conni->next; - if (conni->watch_data) - Xfree (conni->watch_data); + Xfree (conni->watch_data); Xfree (conni); } if (dpy->conn_watchers) { @@ -696,8 +688,8 @@ void _XFreeDisplayStructure(Display *dpy) dpy->conn_watchers = watcher->next; Xfree (watcher); } - if (dpy->filedes) - Xfree (dpy->filedes); + + Xfree (dpy->filedes); _XFreeX11XCBStructure(dpy); diff --git a/libX11/src/PutImage.c b/libX11/src/PutImage.c index e6ac9a23f..de085bcde 100644 --- a/libX11/src/PutImage.c +++ b/libX11/src/PutImage.c @@ -740,8 +740,7 @@ SendXYImage( bytes_per_src, bytes_per_line, bytes_per_dest, req->height, half_order); - if (extra) - Xfree(extra); + Xfree(extra); if (buf == dpy->bufptr) dpy->bufptr += length; @@ -793,8 +792,7 @@ SendZImage( ((req_xoffset == 0) || ((req_yoffset + req->height) < (unsigned)image->height))) { Data(dpy, (char *)src, length); - if (shifted_src) - Xfree(shifted_src); + Xfree(shifted_src); return; } @@ -804,7 +802,7 @@ SendZImage( else if ((dest = (unsigned char *) _XAllocScratch(dpy, length)) == NULL) { - if (shifted_src) Xfree(shifted_src); + Xfree(shifted_src); UnGetReq(PutImage); return; } @@ -831,8 +829,7 @@ SendZImage( else _XSend(dpy, (char *)dest, length); - if (shifted_src) - Xfree(shifted_src); + Xfree(shifted_src); } static void diff --git a/libX11/src/RdBitF.c b/libX11/src/RdBitF.c index 31bf583c9..8a1ad85f1 100644 --- a/libX11/src/RdBitF.c +++ b/libX11/src/RdBitF.c @@ -137,7 +137,7 @@ XReadBitmapFileData ( /* error cleanup and return macro */ #define RETURN(code) \ -{ if (bits) Xfree (bits); fclose (fstream); return code; } +{ Xfree (bits); fclose (fstream); return code; } while (fgets(line, MAX_SIZE, fstream)) { if (strlen(line) == MAX_SIZE-1) diff --git a/libX11/src/ScrResStr.c b/libX11/src/ScrResStr.c index 0601c8644..4a5491a32 100644 --- a/libX11/src/ScrResStr.c +++ b/libX11/src/ScrResStr.c @@ -48,8 +48,7 @@ char *XScreenResourceString(Screen *screen) (unsigned char **) &val) == Success) { if ((actual_type == XA_STRING) && (actual_format == 8)) return val; - if (val) - Xfree(val); + Xfree(val); } return (char *)NULL; } diff --git a/libX11/src/StBytes.c b/libX11/src/StBytes.c index ec6c2e295..d8fca17c2 100644 --- a/libX11/src/StBytes.c +++ b/libX11/src/StBytes.c @@ -74,7 +74,7 @@ char *XFetchBuffer ( *nbytes = nitems; return((char *)data); } - if ((char *) data != NULL) Xfree (data); + Xfree (data); return(NULL); } diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c index a5350e953..80c12987d 100644 --- a/libX11/src/XlibInt.c +++ b/libX11/src/XlibInt.c @@ -398,8 +398,7 @@ _XUnregisterInternalConnection( watch=watch->next, wd++) { (*watch->fn) (dpy, watch->client_data, fd, False, wd); } - if (info_list->watch_data) - Xfree (info_list->watch_data); + Xfree (info_list->watch_data); Xfree (info_list); break; } @@ -1482,8 +1481,9 @@ char *_XAllocScratch( unsigned long nbytes) { if (nbytes > dpy->scratch_length) { - if (dpy->scratch_buffer) Xfree (dpy->scratch_buffer); - if ((dpy->scratch_buffer = Xmalloc(nbytes))) + Xfree (dpy->scratch_buffer); + dpy->scratch_buffer = Xmalloc(nbytes); + if (dpy->scratch_buffer) dpy->scratch_length = nbytes; else dpy->scratch_length = 0; } @@ -1511,8 +1511,8 @@ void _XFreeTemp( char *buf, unsigned long nbytes) { - if (dpy->scratch_buffer) - Xfree(dpy->scratch_buffer); + + Xfree(dpy->scratch_buffer); dpy->scratch_buffer = buf; dpy->scratch_length = nbytes; } diff --git a/libX11/src/xkb/XKBNames.c b/libX11/src/xkb/XKBNames.c index 3f2fd39d7..5a3fb6f8d 100644 --- a/libX11/src/xkb/XKBNames.c +++ b/libX11/src/xkb/XKBNames.c @@ -778,9 +778,14 @@ XkbNoteNameChanges(XkbNameChangesPtr old, { int first, last, old_last, new_last; - wanted &= new->changed; - if ((old == NULL) || (new == NULL) || (wanted == 0)) + if ((old == NULL) || (new == NULL)) return; + + wanted &= new->changed; + + if (wanted == 0) + return; + if (wanted & XkbKeyTypeNamesMask) { if (old->changed & XkbKeyTypeNamesMask) { new_last = (new->first_type + new->num_types - 1); diff --git a/libX11/src/xlibi18n/lcUTF8.c b/libX11/src/xlibi18n/lcUTF8.c index 0f3d0d2ca..38201573e 100644 --- a/libX11/src/xlibi18n/lcUTF8.c +++ b/libX11/src/xlibi18n/lcUTF8.c @@ -1015,7 +1015,7 @@ ucstocs1( XPointer *args, int num_args) { - ucs4_t const *src = (ucs4_t const *) *from; + ucs4_t const *src; unsigned char *dst = (unsigned char *) *to; int unconv_num = 0; Utf8Conv *preferred_charsets = (Utf8Conv *) conv->state; @@ -1027,6 +1027,8 @@ ucstocs1( if (from == NULL || *from == NULL) return 0; + src = (ucs4_t const *) *from; + count = charset_wctocs_exactly(preferred_charsets, &chosen_charset, &chosen_side, conv, dst, *src, *to_left); if (count < 1) { |