summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2011-12-12 17:53:04 +0000
committerAlon Levy <alevy@redhat.com>2012-01-13 18:11:58 +0200
commitfaf0947ebbcdbd2088d6349e936a23b24d09153b (patch)
treebd3376100183cb58cbf9351a12efd7e47a7e423a /server
parent64f4826b6d6918b81d336f8c4296dc6094067f64 (diff)
downloadspice-faf0947ebbcdbd2088d6349e936a23b24d09153b.tar.gz
spice-faf0947ebbcdbd2088d6349e936a23b24d09153b.tar.xz
spice-faf0947ebbcdbd2088d6349e936a23b24d09153b.zip
Remove useless if() before free()
The free() function allows NULL to be passed in, so any code which puts a if() before free() is wasting time
Diffstat (limited to 'server')
-rw-r--r--server/mjpeg_encoder.c3
-rw-r--r--server/red_parse_qxl.c4
-rw-r--r--server/red_worker.c4
-rw-r--r--server/tests/test_display_base.c4
4 files changed, 4 insertions, 11 deletions
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
index 599d4f57..6b68549c 100644
--- a/server/mjpeg_encoder.c
+++ b/server/mjpeg_encoder.c
@@ -129,8 +129,7 @@ static boolean empty_mem_output_buffer(j_compress_ptr cinfo)
memcpy(nextbuffer, dest->buffer, dest->bufsize);
- if (dest->newbuffer != NULL)
- free(dest->newbuffer);
+ free(dest->newbuffer);
dest->newbuffer = nextbuffer;
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 743a82d2..256e8e9b 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -409,9 +409,7 @@ void red_put_image(SpiceImage *red)
switch (red->descriptor.type) {
case SPICE_IMAGE_TYPE_BITMAP:
- if (red->u.bitmap.palette) {
- free(red->u.bitmap.palette);
- }
+ free(red->u.bitmap.palette);
spice_chunks_destroy(red->u.bitmap.data);
break;
case SPICE_IMAGE_TYPE_QUIC:
diff --git a/server/red_worker.c b/server/red_worker.c
index 9d055d55..c8ac8161 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -2472,9 +2472,7 @@ static void red_display_release_stream_clip(RedWorker *worker, StreamClipItem *i
{
if (!--item->refs) {
red_display_release_stream(worker, item->stream_agent);
- if (item->rects) {
- free(item->rects);
- }
+ free(item->rects);
free(item);
}
}
diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c
index 81f942bc..579ef1e4 100644
--- a/server/tests/test_display_base.c
+++ b/server/tests/test_display_base.c
@@ -29,9 +29,7 @@ static void test_spice_destroy_update(SimpleSpiceUpdate *update)
if (!update) {
return;
}
- if (update->bitmap) {
- free(update->bitmap);
- }
+ free(update->bitmap);
free(update);
}