diff options
author | Joe Thornber <ejt@redhat.com> | 2018-06-08 13:40:53 +0100 |
---|---|---|
committer | Joe Thornber <ejt@redhat.com> | 2018-06-08 13:40:53 +0100 |
commit | d5da55ed85248adb066d293c2a1b863ce17d2779 (patch) | |
tree | e526dd2f773e3016a3acd3cb8e490ed11ba7c439 /libdaemon/server | |
parent | c78239d8605f333915543c0e0c3ccf4f4ef5ee8f (diff) | |
download | lvm2-d5da55ed85248adb066d293c2a1b863ce17d2779.tar.gz |
device_mapper: remove dbg_malloc.
I wrote dbg_malloc before we had valgrind. These days there's just
no need.
Diffstat (limited to 'libdaemon/server')
-rw-r--r-- | libdaemon/server/daemon-log.c | 12 | ||||
-rw-r--r-- | libdaemon/server/daemon-server.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libdaemon/server/daemon-log.c b/libdaemon/server/daemon-log.c index 8c2a20821..864f504f6 100644 --- a/libdaemon/server/daemon-log.c +++ b/libdaemon/server/daemon-log.c @@ -91,7 +91,7 @@ void daemon_logf(log_state *s, int type, const char *fmt, ...) { va_start(ap, fmt); if (dm_vasprintf(&buf, fmt, ap) >= 0) { daemon_log(s, type, buf); - dm_free(buf); + free(buf); } /* else return_0 */ va_end(ap); } @@ -127,7 +127,7 @@ void daemon_log_multi(log_state *s, int type, const char *prefix, const char *ms if (!_type_interesting(s, type)) return; - buf = dm_strdup(msg); + buf = strdup(msg); pos = buf; if (!buf) @@ -140,7 +140,7 @@ void daemon_log_multi(log_state *s, int type, const char *prefix, const char *ms _log_line(pos, &b); pos = next ? next + 1 : 0; } - dm_free(buf); + free(buf); } void daemon_log_enable(log_state *s, int outlet, int type, int enable) @@ -184,7 +184,7 @@ int daemon_log_parse(log_state *s, int outlet, const char *types, int enable) if (!types || !types[0]) return 1; - if (!(buf = dm_strdup(types))) + if (!(buf = strdup(types))) return 0; pos = buf; @@ -193,13 +193,13 @@ int daemon_log_parse(log_state *s, int outlet, const char *types, int enable) if (next) *next = 0; if (!_parse_one(s, outlet, pos, enable)) { - dm_free(buf); + free(buf); return 0; } pos = next ? next + 1 : 0; } - dm_free(buf); + free(buf); return 1; } diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 4acb00e0b..78c8221e2 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -515,7 +515,7 @@ static int _handle_connect(daemon_state s) if (fcntl(client.socket_fd, F_SETFD, FD_CLOEXEC)) WARN(&s, "setting CLOEXEC on client socket fd %d failed", client.socket_fd); - if (!(ts = dm_malloc(sizeof(thread_state)))) { + if (!(ts = malloc(sizeof(thread_state)))) { if (close(client.socket_fd)) perror("close"); ERROR(&s, "Failed to allocate thread state"); @@ -547,7 +547,7 @@ static void _reap(daemon_state s, int waiting) if ((errno = pthread_join(ts->client.thread_id, &rv))) ERROR(&s, "pthread_join failed: %s", strerror(errno)); last->next = ts->next; - dm_free(ts); + free(ts); } else last = ts; ts = last->next; |