XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages 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
parent 9e999d18b0
commit 99275ad2fa
10 changed files with 41 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dix/ptrveloc.c
View File

@@ -952,11 +952,9 @@ SetAccelerationProfile(
if(profile == NULL && profile_num != PROFILE_UNINITIALIZE)
return FALSE;
if(vel->profile_private != NULL){
/* Here one could free old profile-private data */
free(vel->profile_private);
vel->profile_private = NULL;
}
/* Here one could free old profile-private data */
free(vel->profile_private);
vel->profile_private = NULL;
/* Here one could init profile-private data */
vel->Profile = profile;
vel->statistics.profile_number = profile_num;

7
hw/kdrive/fake/fake.c
View File

@@ -215,11 +215,8 @@ fakeUnmapFramebuffer (KdScreenInfo *screen)
{
FakePriv *priv = screen->card->driver;
KdShadowFbFree (screen);
if (priv->base)
{
free (priv->base);
priv->base = 0;
}
free(priv->base);
priv->base = NULL;
return TRUE;
}

7
hw/xwin/wincmap.c
View File

@@ -516,11 +516,8 @@ winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap)
pScreen->blackPixel = 0;
/* Free colormap */
if (ppeColors != NULL)
{
free (ppeColors);
ppeColors = NULL;
}
free(ppeColors);
ppeColors = NULL;
/* Free the DC */
if (hdc != NULL)

7
hw/xwin/winpixmap.c
View File

@@ -163,11 +163,8 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
if (pPixmapPriv->hBitmap) DeleteObject (pPixmapPriv->hBitmap);
/* Free the bitmap info header memory */
if (pPixmapPriv->pbmih != NULL)
{
free (pPixmapPriv->pbmih);
pPixmapPriv->pbmih = NULL;
}
free(pPixmapPriv->pbmih);
pPixmapPriv->pbmih = NULL;
/* Free the pixmap memory */
free (pPixmap);

6
miext/rootless/rootlessWindow.c
View File

@@ -1140,10 +1140,8 @@ FinishFrameResize(WindowPtr pWin, Bool gravity, int oldX, int oldY,
}
}
if (gResizeDeathBits != NULL) {
free(gResizeDeathBits);
gResizeDeathBits = NULL;
}
free(gResizeDeathBits);
gResizeDeathBits = NULL;
if (gravity) {
pScreen->CopyWindow = gResizeOldCopyWindowProc;

14
render/miindex.c
View File

@@ -322,16 +322,10 @@ void
miCloseIndexed (ScreenPtr pScreen,
PictFormatPtr pFormat)
{
if (pFormat->index.devPrivate)
{
free(pFormat->index.devPrivate);
pFormat->index.devPrivate = 0;
}
if (pFormat->index.pValues)
{
free(pFormat->index.pValues);
pFormat->index.pValues = 0;
}
free(pFormat->index.devPrivate);
pFormat->index.devPrivate = NULL;
free(pFormat->index.pValues);
pFormat->index.pValues = NULL;
}
void

7
render/picture.c
View File

@@ -1391,11 +1391,8 @@ SetPictureTransform (PicturePtr pPicture,
}
else
{
if (pPicture->transform)
{
free(pPicture->transform);
pPicture->transform = 0;
}
free(pPicture->transform);
pPicture->transform = NULL;
}
pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;

6
xkb/XKBAlloc.c
View File

@@ -212,10 +212,8 @@ XkbNamesPtr names;
register XkbKeyTypePtr type;
type= map->types;
for (i=0;i<map->num_types;i++,type++) {
if (type->level_names!=NULL) {
free(type->level_names);
type->level_names= NULL;
}
free(type->level_names);
type->level_names = NULL;
}
}
}

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;

34
xkb/XKBMAlloc.c
View File

@@ -321,9 +321,9 @@ KeyCode matchingKeys[XkbMaxKeyCount],nMatchingKeys;
return BadAlloc;
}
}
else if (type->preserve!=NULL) {
else {
free(type->preserve);
type->preserve= NULL;
type->preserve = NULL;
}
type->map_count= map_count;
}
@@ -807,19 +807,13 @@ XkbClientMapPtr map;
register int i;
XkbKeyTypePtr type;
for (i=0,type=map->types;i<map->num_types;i++,type++) {
if (type->map!=NULL) {
free(type->map);
type->map= NULL;
}
if (type->preserve!=NULL) {
free(type->preserve);
type->preserve= NULL;
}
free(type->map);
type->map = NULL;
free(type->preserve);
type->preserve = NULL;
type->map_count= 0;
if (type->level_names!=NULL) {
free(type->level_names);
type->level_names= NULL;
}
free(type->level_names);
type->level_names = NULL;
}
}
free(map->types);
@@ -828,10 +822,8 @@ XkbClientMapPtr map;
}
}
if (what&XkbKeySymsMask) {
if (map->key_sym_map!=NULL) {
free(map->key_sym_map);
map->key_sym_map= NULL;
}
free(map->key_sym_map);
map->key_sym_map = NULL;
if (map->syms!=NULL) {
free(map->syms);
map->size_syms= map->num_syms= 0;
@@ -864,10 +856,8 @@ XkbServerMapPtr map;
map->explicit= NULL;
}
if (what&XkbKeyActionsMask) {
if (map->key_acts!=NULL) {
free(map->key_acts);
map->key_acts= NULL;
}
free(map->key_acts);
map->key_acts = NULL;
if (map->acts!=NULL) {
free(map->acts);
map->num_acts= map->size_acts= 0;