hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues Projects Releases Wiki Activity

Remove superfluous if(p!=NULL) checks around free(p); p=NULL;

Browse source 
This patch has been generated by the following Coccinelle semantic patch:

@@
expression E;
@@
-  if (E != NULL) {
-   free(E);
(
-   E = NULL;
|
-   E = 0;
)
-  }
+ free(E);
+ E = NULL;

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Cyril Brulebois 2010-11-10 16:06:10 +01:00 • committed by Peter Hutterer
commit 99275ad2fa
10 changed files with 41 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

30
xkb/XKBGAlloc.c
View file

@ -50,10 +50,8 @@ _XkbFreeGeomLeafElems( Bool freeAll,
{
if ((freeAll)||(*elems==NULL)) {
*num_inout= *sz_inout= 0;
if (*elems!=NULL) {
free(*elems);
*elems= NULL;
}
free(*elems);
*elems = NULL;
return;
}
@ -373,22 +371,16 @@ XkbDoodadPtr doodad= (XkbDoodadPtr)doodad_in;
switch (doodad->any.type) {
case XkbTextDoodad:
{
if (doodad->text.text!=NULL) {
free(doodad->text.text);
doodad->text.text= NULL;
}
if (doodad->text.font!=NULL) {
free(doodad->text.font);
doodad->text.font= NULL;
}
free(doodad->text.text);
doodad->text.text = NULL;
free(doodad->text.font);
doodad->text.font = NULL;
}
break;
case XkbLogoDoodad:
{
if (doodad->logo.logo_name!=NULL) {
free(doodad->logo.logo_name);
doodad->logo.logo_name= NULL;
}
free(doodad->logo.logo_name);
doodad->logo.logo_name = NULL;
}
break;
}
@ -434,10 +426,8 @@ XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap)
if ((which&XkbGeomKeyAliasesMask)&&(geom->key_aliases!=NULL))
XkbFreeGeomKeyAliases(geom,0,geom->num_key_aliases,TRUE);
if (freeMap) {
if (geom->label_font!=NULL) {
free(geom->label_font);
geom->label_font= NULL;
}
free(geom->label_font);
geom->label_font = NULL;
free(geom);
}
return;