From f7047c2daf760385edf83df10be4259bea190e75 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 6 Jun 2014 18:25:12 +0200 Subject: block: Drop superfluous conditionals around g_free() Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi --- block/curl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'block/curl.c') diff --git a/block/curl.c b/block/curl.c index 8c84141..79ff2f1 100644 --- a/block/curl.c +++ b/block/curl.c @@ -440,10 +440,8 @@ static void curl_detach_aio_context(BlockDriverState *bs) curl_easy_cleanup(s->states[i].curl); s->states[i].curl = NULL; } - if (s->states[i].orig_buf) { - g_free(s->states[i].orig_buf); - s->states[i].orig_buf = NULL; - } + g_free(s->states[i].orig_buf); + s->states[i].orig_buf = NULL; } if (s->multi) { curl_multi_cleanup(s->multi); @@ -638,8 +636,7 @@ static void curl_readv_bh_cb(void *p) acb->end = (acb->nb_sectors * SECTOR_SIZE); state->buf_off = 0; - if (state->orig_buf) - g_free(state->orig_buf); + g_free(state->orig_buf); state->buf_start = start; state->buf_len = acb->end + s->readahead_size; end = MIN(start + state->buf_len, s->len) - 1; -- cgit v1.1