[libvirt] [PATCH v2 3/10] rpc: Remove unnecessary calls

[Peter Krempa]

On 01/18/13 15:29, John Ferlan wrote:
> The code is not reachable as of commit id: bb85f229. Removed
> virKeepAliveStop() and virObjectUnref() because 'ka' cannot be
> anything but NULL at the cleanup label.
> ---
>   src/rpc/virnetserverclient.c | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
> index 85239dd..40e8481 100644
> --- a/src/rpc/virnetserverclient.c
> +++ b/src/rpc/virnetserverclient.c
> @@ -1360,9 +1360,6 @@ virNetServerClientInitKeepAlive(virNetServerClientPtr client,
>
>   cleanup:
>       virObjectUnlock(client);
> -    if (ka)
> -        virKeepAliveStop(ka);
> -    virObjectUnref(ka);
>
>       return ret;
>   }
>

ACK with one nit. the asignment ka = NULL just before the cleanup label 
is dead code now too. I will be pushing this with the following change 
squashed in:

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 40e8481..af0560e 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -1356,7 +1356,6 @@ 
virNetServerClientInitKeepAlive(virNetServerClientPtr client,
      virObjectRef(client);

      client->keepalive = ka;
-    ka = NULL;

  cleanup:
      virObjectUnlock(client);


Peter