ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '0b7e651615b9b01b9f3f94b6fb1dcfbbbd02c72b':
  Libion: Remove unused variables
This commit is contained in:
Andreas Gampe 2014-11-25 19:58:36 +00:00 • committed by Android Git Automerger
commit fcb2f0abe0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libion/ion.c
View file

@ -117,7 +117,6 @@ int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
int ion_share(int fd, ion_user_handle_t handle, int *share_fd) int ion_share(int fd, ion_user_handle_t handle, int *share_fd)
{ {
int map_fd;
int ret; int ret;
struct ion_fd_data data = { struct ion_fd_data data = {
.handle = handle, .handle = handle,

4
libion/ion_test.c
View file

@ -164,8 +164,9 @@ void ion_share_test()
printf("master->master? [%10s]\n", ptr); printf("master->master? [%10s]\n", ptr);
if (recvmsg(sd[0], &msg, 0) < 0) if (recvmsg(sd[0], &msg, 0) < 0)
perror("master recv 1"); perror("master recv 1");
close(fd);
_exit(0);
} else { } else {
struct msghdr msg;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
char* ptr; char* ptr;
int fd, recv_fd; int fd, recv_fd;
@ -205,6 +206,7 @@ void ion_share_test()
strcpy(ptr, "child"); strcpy(ptr, "child");
printf("child sending msg 2\n"); printf("child sending msg 2\n");
sendmsg(sd[1], &child_msg, 0); sendmsg(sd[1], &child_msg, 0);
close(fd);
} }
} }