summaryrefslogtreecommitdiff
path: root/record
diff options
context:
space:
mode:
authorMikhail Gusarov <dottedmag@dottedmag.net>2010-06-06 15:28:30 +0700
committerMikhail Gusarov <dottedmag@dottedmag.net>2010-06-06 20:27:18 +0700
commit0a4d8cbdcd7b25313fb29ccdb498044af95f7de6 (patch)
tree3534c9035180b7e0d2ebbbf0202a370cb61f8e8d /record
parent5a0fc0ad21d562612676ef88ef2d533b2391810a (diff)
Remove more superfluous if(p) checks around free(p)
This patch has been generated by the following Coccinelle semantic patch: @@ expression E; @@ -if(E) { free(E); } +free(E); Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'record')
-rw-r--r--record/record.c8
-rw-r--r--record/set.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/record/record.c b/record/record.c
index 5bd46c29e..53bdfec71 100644
--- a/record/record.c
+++ b/record/record.c
@@ -1868,8 +1868,7 @@ bailout:
if (si)
{
for (i = 0; i < maxSets; i++)
- if (si[i].intervals)
- free(si[i].intervals);
+ free(si[i].intervals);
free(si);
}
if (pCanonClients && pCanonClients != (XID *)&stuff[1])
@@ -1955,8 +1954,7 @@ ProcRecordCreateContext(ClientPtr client)
err = BadAlloc;
}
bailout:
- if (pContext)
- free(pContext);
+ free(pContext);
return err;
} /* ProcRecordCreateContext */
@@ -2352,7 +2350,7 @@ ProcRecordGetContext(ClientPtr client)
bailout:
for (i = 0; i < nRCAPs; i++)
{
- if (pRangeInfo[i].pRanges) free(pRangeInfo[i].pRanges);
+ free(pRangeInfo[i].pRanges);
}
free(pRangeInfo);
return err;
diff --git a/record/set.c b/record/set.c
index f2064fd3c..a9a6a4465 100644
--- a/record/set.c
+++ b/record/set.c
@@ -360,7 +360,7 @@ IntervalListCreateSet(RecordSetInterval *pIntervals, int nIntervals,
memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval));
prls->nIntervals = nIntervals;
bailout:
- if (stackIntervals) free(stackIntervals);
+ free(stackIntervals);
return (RecordSetPtr)prls;
}