device_mapper: remove dbg_malloc.

I wrote dbg_malloc before we had valgrind.  These days there's just
no need.

1 files changed, 28 insertions, 28 deletions

diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 3e1b445a4..bec7f0fb9 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -13,6 +13,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "base/memory/zalloc.h"
 #include "device_mapper/misc/dmlib.h"
 #include "device_mapper/ioctl/libdm-targets.h"
 #include "device_mapper/libdm-common.h"
@@ -467,7 +468,7 @@ static void _dm_zfree_string(char *string)
 {
 	if (string) {
 		memset(string, 0, strlen(string));
-		dm_free(string);
+		free(string);
 	}
 }
 
@@ -475,7 +476,7 @@ static void _dm_zfree_dmi(struct dm_ioctl *dmi)
 {
 	if (dmi) {
 		memset(dmi, 0, dmi->data_size);
-		dm_free(dmi);
+		free(dmi);
 	}
 }
 
@@ -486,8 +487,8 @@ static void _dm_task_free_targets(struct dm_task *dmt)
 	for (t = dmt->head; t; t = n) {
 		n = t->next;
 		_dm_zfree_string(t->params);
-		dm_free(t->type);
-		dm_free(t);
+		free(t->type);
+		free(t);
 	}
 
 	dmt->head = dmt->tail = NULL;
@@ -497,14 +498,14 @@ void dm_task_destroy(struct dm_task *dmt)
 {
 	_dm_task_free_targets(dmt);
 	_dm_zfree_dmi(dmt->dmi.v4);
-	dm_free(dmt->dev_name);
-	dm_free(dmt->mangled_dev_name);
-	dm_free(dmt->newname);
-	dm_free(dmt->message);
-	dm_free(dmt->geometry);
-	dm_free(dmt->uuid);
-	dm_free(dmt->mangled_uuid);
-	dm_free(dmt);
+	free(dmt->dev_name);
+	free(dmt->mangled_dev_name);
+	free(dmt->newname);
+	free(dmt->message);
+	free(dmt->geometry);
+	free(dmt->uuid);
+	free(dmt->mangled_uuid);
+	free(dmt);
 }
 
 /*
@@ -852,8 +853,8 @@ int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid)
 		newuuid = mangled_uuid;
 	}
 
-	dm_free(dmt->newname);
-	if (!(dmt->newname = dm_strdup(newuuid))) {
+	free(dmt->newname);
+	if (!(dmt->newname = strdup(newuuid))) {
 		log_error("dm_task_set_newuuid: strdup(%s) failed", newuuid);
 		return 0;
 	}
@@ -864,8 +865,8 @@ int dm_task_set_newuuid(struct dm_task *dmt, const char *newuuid)
 
 int dm_task_set_message(struct dm_task *dmt, const char *message)
 {
-	dm_free(dmt->message);
-	if (!(dmt->message = dm_strdup(message))) {
+	free(dmt->message);
+	if (!(dmt->message = strdup(message))) {
 		log_error("dm_task_set_message: strdup failed");
 		return 0;
 	}
@@ -883,7 +884,7 @@ int dm_task_set_sector(struct dm_task *dmt, uint64_t sector)
 int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads,
 			 const char *sectors, const char *start)
 {
-	dm_free(dmt->geometry);
+	free(dmt->geometry);
 	if (dm_asprintf(&(dmt->geometry), "%s %s %s %s",
 			cylinders, heads, sectors, start) < 0) {
 		log_error("dm_task_set_geometry: sprintf failed");
@@ -977,18 +978,18 @@ struct target *create_target(uint64_t start, uint64_t len, const char *type,
 		return NULL;
 	}
 
-	if (!(t = dm_zalloc(sizeof(*t)))) {
+	if (!(t = zalloc(sizeof(*t)))) {
 		log_error("create_target: malloc(%" PRIsize_t ") failed",
 			  sizeof(*t));
 		return NULL;
 	}
 
-	if (!(t->params = dm_strdup(params))) {
+	if (!(t->params = strdup(params))) {
 		log_error("create_target: strdup(params) failed");
 		goto bad;
 	}
 
-	if (!(t->type = dm_strdup(type))) {
+	if (!(t->type = strdup(type))) {
 		log_error("create_target: strdup(type) failed");
 		goto bad;
 	}
@@ -999,8 +1000,8 @@ struct target *create_target(uint64_t start, uint64_t len, const char *type,
 
       bad:
 	_dm_zfree_string(t->params);
-	dm_free(t->type);
-	dm_free(t);
+	free(t->type);
+	free(t);
 	return NULL;
 }
 
@@ -1168,7 +1169,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 	while (repeat_count--)
 		len *= 2;
 
-	if (!(dmi = dm_zalloc(len)))
+	if (!(dmi = zalloc(len)))
 		return NULL;
 
 	version = &_cmd_data_v4[dmt->type].version;
@@ -1463,9 +1464,9 @@ static int _create_and_load_v4(struct dm_task *dmt)
 
 	/* Use the original structure last so the info will be correct */
 	dmt->type = DM_DEVICE_RESUME;
-	dm_free(dmt->uuid);
+	free(dmt->uuid);
 	dmt->uuid = NULL;
-	dm_free(dmt->mangled_uuid);
+	free(dmt->mangled_uuid);
 	dmt->mangled_uuid = NULL;
 
 	if (dm_task_run(dmt))
@@ -1473,9 +1474,9 @@ static int _create_and_load_v4(struct dm_task *dmt)
 
       revert:
 	dmt->type = DM_DEVICE_REMOVE;
-	dm_free(dmt->uuid);
+	free(dmt->uuid);
 	dmt->uuid = NULL;
-	dm_free(dmt->mangled_uuid);
+	free(dmt->mangled_uuid);
 	dmt->mangled_uuid = NULL;
 
 	/*
@@ -2141,7 +2142,6 @@ void dm_lib_exit(void)
 		dm_bitset_destroy(_dm_bitset);
 	_dm_bitset = NULL;
 	dm_pools_check_leaks();
-	dm_dump_memory();
 	_version_ok = 1;
 	_version_checked = 0;
 }