commit 56a3be0d6eaa1bc264736e399fb32d3094f0b513
author Pavlin Radoslavov <pavlin@google.com> Tue Jun 02 13:54:58 2015 -0700
committer Andre Eisenbach <eisenbach@google.com> Wed Jun 03 00:14:57 2015 +0000
tree c5ff3597e0c93e4eb0ad483d8e156e26985fecb3
parent 1b0f107768ba1a0f93abf68851bacbe650f27eff

Replace malloc/calloc/free with osi_malloc/osi_calloc/osi_free

There were several leftover places that were still using
malloc/calloc/free .
Those are replaced to use osi_malloc/osi_calloc/osi_free like
majority of the rest of the code.

Note: There are few remaining places that are still using
malloc/calloc/free:
 * Some of the unit tests
 * audio_a2dp_hw/audio_a2dp_hw.c
   It is used as part of the audio.a2dp.default.so library,
   and the bluetooth.default.so library
   Its usage of malloc/calloc/free should be refactored
   independently.

Change-Id: Iafbed996e5f1ae8eb1343fb2acfadf32e515e419

btif/src/btif_sock_l2cap.c

diff --git a/btif/src/btif_sock_l2cap.c b/btif/src/btif_sock_l2cap.c
index b85662f..d66fea6 100644
--- a/btif/src/btif_sock_l2cap.c
+++ b/btif/src/btif_sock_l2cap.c
@@ -25,6 +25,7 @@
 #include <pthread.h>
 
 #define LOG_TAG "BTIF_SOCK"
+#include "osi/include/allocator.h"
 #include "btif_common.h"
 #include "btif_util.h"
 
@@ -125,15 +126,15 @@
     if(len)
         sock->bytes_buffered -= *len;
 
-    free(p);
+    osi_free(p);
 
     return TRUE;
 }
 
 static struct packet *packet_alloc(const uint8_t *data, uint32_t len)
 {
-    struct packet *p = calloc(1, sizeof(*p));
-    uint8_t *buf = malloc(len);
+    struct packet *p = osi_calloc(sizeof(*p));
+    uint8_t *buf = osi_malloc(len);
 
     if (p && buf) {
 
@@ -143,9 +144,9 @@
         return p;
 
     } else if (p)
-       free(p);
+       osi_free(p);
     else if (buf)
-       free(buf);
+       osi_free(buf);
 
     return NULL;
 }
@@ -267,7 +268,7 @@
     }
 
     while (packet_get_head_l(sock, &buf, NULL))
-        free(buf);
+        osi_free(buf);
 
     //lower-level close() should be idempotent... so let's call it and see...
     // Only call if we are non server connections
@@ -286,7 +287,7 @@
     }
 
     APPL_TRACE_DEBUG("SOCK_LIST: free(id = %d)", sock->id);
-    free(sock);
+    osi_free(sock);
 }
 
 static void btsock_l2cap_free(l2cap_socket *sock)
@@ -308,7 +309,7 @@
     if (flags & BTSOCK_FLAG_AUTH)
         security |= is_server ? BTM_SEC_IN_AUTHENTICATE : BTM_SEC_OUT_AUTHENTICATE;
 
-    sock = calloc(1, sizeof(*sock));
+    sock = osi_calloc(sizeof(*sock));
     if (!sock) {
         APPL_TRACE_ERROR("alloc failed");
         goto fail_alloc;
@@ -358,7 +359,7 @@
     return sock;
 
 fail_sockpair:
-    free(sock);
+    osi_free(sock);
 
 fail_alloc:
     return NULL;
@@ -659,7 +660,7 @@
     l2cap_socket *sock;
 
     if (req_id != NULL) {
-        free(req_id); //free the buffer
+        osi_free(req_id); //free the buffer
     }
 
     pthread_mutex_lock(&state_lock);
@@ -677,7 +678,7 @@
     l2cap_socket *sock;
 
     if (req_id != NULL) {
-        free(req_id); //free the buffer
+        osi_free(req_id); //free the buffer
     }
 
     pthread_mutex_lock(&state_lock);
@@ -966,16 +967,16 @@
         int sent = send(sock->our_fd, buf, len, MSG_DONTWAIT);
 
         if (sent == (signed)len)
-            free(buf);
+            osi_free(buf);
         else if (sent >= 0) {
             packet_put_head_l(sock, buf + sent, len - sent);
-            free(buf);
+            osi_free(buf);
             if (!sent) /* special case if other end not keeping up */
                 return TRUE;
         }
         else {
             packet_put_head_l(sock, buf, len);
-            free(buf);
+            osi_free(buf);
             return errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN;
         }
     }
@@ -999,7 +1000,7 @@
 
                 if (!(flags & SOCK_THREAD_FD_EXCEPTION) || (ioctl(sock->our_fd, FIONREAD, &size)
                         == 0 && size)) {
-                    uint8_t *buffer = malloc(L2CAP_MAX_SDU_LENGTH);
+                    uint8_t *buffer = osi_malloc(L2CAP_MAX_SDU_LENGTH);
                     //uint8_t *buffer = (uint8_t*)GKI_getbuf(L2CAP_MAX_SDU_LENGTH);
                     /* Apparently we hijack the req_id (UINT32) to pass the pointer to the buffer to
                      * the write complete callback, which call a free... wonder if this works on a