]> sourceware.org Git - lvm2.git/commitdiff
Do not hide deallocation of buffer
authorZdenek Kabelac <zkabelac@redhat.com>
Mon, 27 Feb 2012 11:49:16 +0000 (11:49 +0000)
committerZdenek Kabelac <zkabelac@redhat.com>
Mon, 27 Feb 2012 11:49:16 +0000 (11:49 +0000)
As API is passing structures by value, do not leave
the function which created buffer and keeps valid pointer
look like it would be some memory leak and move
free of buffer from inner function - makes more obvious,
how is the memory management handled.

daemons/common/daemon-client.c

index 08821a73cc0ee7be197156ebecc0701f6ad171b0..558f770ea6a987e8d16ab21588dad6ec1c406403 100644 (file)
@@ -62,8 +62,6 @@ daemon_reply daemon_send(daemon_handle h, daemon_request rq)
        if (!write_buffer(h.socket_fd, rq.buffer, strlen(rq.buffer)))
                reply.error = errno;
 
-       dm_free(rq.buffer);
-
        if (read_buffer(h.socket_fd, &reply.buffer)) {
                reply.cft = dm_config_from_string(reply.buffer);
        } else
@@ -93,6 +91,8 @@ daemon_reply daemon_send_simple(daemon_handle h, const char *id, ...)
                return err;
 
        repl = daemon_send(h, rq);
+       dm_free(rq.buffer);
+
        return repl;
 }
 
This page took 1.400365 seconds and 5 git commands to generate.