Update of /cvsroot/alsa/alsa-lib/aserver
In directory sc8-pr-cvs1:/tmp/cvs-serv30622/aserver
Modified Files:
aserver.c
Log Message:
Moved send_fd/receive_fd routines to src/socket.c .
Index: aserver.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/aserver/aserver.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- aserver.c 22 Feb 2003 17:19:02 -0000 1.55
+++ aserver.c 18 Mar 2003 18:00:05 -0000 1.56
@@ -106,39 +106,6 @@
return sock;
}
-static int send_fd(int sock, void *data, size_t len, int fd)
-{
- int ret;
- size_t cmsg_len = CMSG_LEN(sizeof(int));
- struct cmsghdr *cmsg = alloca(cmsg_len);
- int *fds = (int *) CMSG_DATA(cmsg);
- struct msghdr msghdr;
- struct iovec vec;
-
- vec.iov_base = (void *)&data;
- vec.iov_len = len;
-
- cmsg->cmsg_len = cmsg_len;
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
- *fds = fd;
-
- msghdr.msg_name = NULL;
- msghdr.msg_namelen = 0;
- msghdr.msg_iov = &vec;
- msghdr.msg_iovlen = 1;
- msghdr.msg_control = cmsg;
- msghdr.msg_controllen = cmsg_len;
- msghdr.msg_flags = 0;
-
- ret = sendmsg(sock, &msghdr, 0 );
- if (ret < 0) {
- SYSERROR("sendmsg failed");
- return -errno;
- }
- return ret;
-}
-
struct pollfd *pollfds;
unsigned int pollfds_count = 0;
typedef struct waiter waiter_t;
@@ -397,7 +364,7 @@
pfd.events = POLLHUP;
if (poll(&pfd, 1, 0) == 1)
return -EBADFD;
- err = send_fd(client->ctrl_fd, buf, 1, fd);
+ err = snd_send_fd(client->ctrl_fd, buf, 1, fd);
if (err != 1)
return -EBADFD;
return 0;
-------------------------------------------------------
This SF.net email is sponsored by: Does your code think in ink?
You could win a Tablet PC. Get a free Tablet PC hat just for playing.
What are you waiting for?
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr5043en
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
