diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2012-02-27 11:49:16 +0000 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2012-02-27 11:49:16 +0000 |
commit | 5627fc8e7b41e481cf1daf64432d1b44c9d6a072 (patch) | |
tree | 4725006c99e70dc0e711e98745972cd14455e494 /daemons | |
parent | c57a9960b522e5f82eabfa29b1cb0ae7c00b1249 (diff) | |
download | lvm2-5627fc8e7b41e481cf1daf64432d1b44c9d6a072.tar.gz lvm2-5627fc8e7b41e481cf1daf64432d1b44c9d6a072.tar.xz lvm2-5627fc8e7b41e481cf1daf64432d1b44c9d6a072.zip |
Do not hide deallocation of buffer
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.
Diffstat (limited to 'daemons')
-rw-r--r-- | daemons/common/daemon-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/daemons/common/daemon-client.c b/daemons/common/daemon-client.c index 08821a73..558f770e 100644 --- a/daemons/common/daemon-client.c +++ b/daemons/common/daemon-client.c @@ -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; } |