commit 58b80be8110b7229c1543c60f7fa698217e30c6e
author Andreas Gampe <agampe@google.com> Tue Nov 25 20:03:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 20:03:45 2014 +0000
tree e29f39a157979a850d553a3aa8635a36f93f7d98
parent da8edff7eddbfad5c7a3527080d62ff18ccccfae
parent fcb2f0abe07ffd1c7a87bdcd7878a556ce0049fb

am fcb2f0ab: am 0b7e6516: Merge "Libion: Remove unused variables"

* commit 'fcb2f0abe07ffd1c7a87bdcd7878a556ce0049fb':
  Libion: Remove unused variables

libion/ion.c

diff --git a/libion/ion.c b/libion/ion.c
index 32781f7..27ec47a 100644
--- a/libion/ion.c
+++ b/libion/ion.c
@@ -119,7 +119,6 @@
 
 int ion_share(int fd, ion_user_handle_t handle, int *share_fd)
 {
-    int map_fd;
     int ret;
     struct ion_fd_data data = {
         .handle = handle,

libion/ion_test.c

diff --git a/libion/ion_test.c b/libion/ion_test.c
index 8872282..b7d5583 100644
--- a/libion/ion_test.c
+++ b/libion/ion_test.c
@@ -164,8 +164,9 @@
         printf("master->master? [%10s]\n", ptr);
         if (recvmsg(sd[0], &msg, 0) < 0)
             perror("master recv 1");
+        close(fd);
+        _exit(0);
     } else {
-        struct msghdr msg;
         struct cmsghdr *cmsg;
         char* ptr;
         int fd, recv_fd;
@@ -205,6 +206,7 @@
         strcpy(ptr, "child");
         printf("child sending msg 2\n");
         sendmsg(sd[1], &child_msg, 0);
+        close(fd);
     }
 }