commit 96b7eb2545d40cffe90256bd9a46dc9a315e3661
author Claudio Takahasi <claudio.takahasi@openbossa.org> Thu Feb 24 18:19:28 2011 -0300
committer Johan Hedberg <johan.hedberg@nokia.com> Thu Feb 24 18:36:38 2011 -0300
tree b16e41a4109337c5a0cda8cc5c69fb5b647019ab
parent 448456a19f74226062b3157a203bfe25dbdfef90

Use attribute data list memory allocation function on attrib server

src/attrib-server.c

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 62c10f4..2bfeed4 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -381,17 +381,13 @@
 
 	length = g_slist_length(groups);
 
-	adl = g_new0(struct att_data_list, 1);
-	adl->len = last_size + 4;	/* Length of each element */
-	adl->num = length;	/* Number of primary or secondary services */
-	adl->data = g_malloc(length * sizeof(uint8_t *));
+	adl = att_data_list_alloc(length, last_size + 4);
 
 	for (i = 0, l = groups; l; l = l->next, i++) {
 		uint8_t *value;
 
 		cur = l->data;
 
-		adl->data[i] = g_malloc(adl->len);
 		value = (void *) adl->data[i];
 
 		att_put_u16(cur->handle, value);
@@ -472,16 +468,12 @@
 	/* Handle length plus attribute value length */
 	length += 2;
 
-	adl = g_new0(struct att_data_list, 1);
-	adl->len = length;	/* Length of each element */
-	adl->num = num;		/* Number of primary or secondary services */
-	adl->data = g_malloc(num * sizeof(uint8_t *));
+	adl = att_data_list_alloc(num, length);
 
 	for (i = 0, l = types; l; i++, l = l->next) {
 		uint8_t *value;
 
 		a = l->data;
-		adl->data[i] = g_malloc(length);
 
 		value = (void *) adl->data[i];
 
@@ -545,16 +537,12 @@
 		format = 0x02;
 	}
 
-	adl = g_new0(struct att_data_list, 1);
-	adl->len = length + 2;	/* Length of each element */
-	adl->num = num;		/* Number of primary or secondary services */
-	adl->data = g_malloc(num * sizeof(uint8_t *));
+	adl = att_data_list_alloc(num, length + 2);
 
 	for (i = 0, l = info; l; i++, l = l->next) {
 		uint8_t *value;
 
 		a = l->data;
-		adl->data[i] = g_malloc(adl->len);
 
 		value = (void *) adl->data[i];