[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH] block/ssh: remove dead code
From: |
Richard W.M. Jones |
Subject: |
Re: [Qemu-trivial] [PATCH] block/ssh: remove dead code |
Date: |
Mon, 14 Sep 2015 12:18:10 +0100 |
User-agent: |
Mutt/1.5.20 (2009-12-10) |
On Mon, Sep 14, 2015 at 01:12:34PM +0200, Paolo Bonzini wrote:
> The "err" label cannot be reached with qp != NULL. Remove the free-ing
> of qp and avoid future regressions by removing the initializer.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> block/ssh.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/block/ssh.c b/block/ssh.c
> index 8d06739..d35b51f 100644
> --- a/block/ssh.c
> +++ b/block/ssh.c
> @@ -193,7 +193,7 @@ sftp_error_report(BDRVSSHState *s, const char *fs, ...)
> static int parse_uri(const char *filename, QDict *options, Error **errp)
> {
> URI *uri = NULL;
> - QueryParams *qp = NULL;
> + QueryParams *qp;
> int i;
>
> uri = uri_parse(filename);
> @@ -249,9 +249,6 @@ static int parse_uri(const char *filename, QDict
> *options, Error **errp)
> return 0;
>
> err:
> - if (qp) {
> - query_params_free(qp);
> - }
> if (uri) {
> uri_free(uri);
> }
The patch looks correct to me, so:
ACK
However (in libguestfs) we would generally leave such code around to
make it more future proof against rearrangements of the code which
could cause a memory leak. But then again, libguestfs (following
systemd practice) uses __attribute__((cleanup)) extensively ...
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/