mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak the handling of missing credential support so that we minimise non-POSIX

Browse source 
headers in our headers.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@597 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-02-24 16:27:39 +00:00
parent 3f264b2c4a
commit 9f1b793689
2 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/polypcore/iochannel.c
View file

@ -29,6 +29,13 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
#include "winsock.h" #include "winsock.h"
#include <polypcore/util.h> #include <polypcore/util.h>
@ -370,7 +377,27 @@ ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, struc
return r; return r;
} }
#endif #else /* SCM_CREDENTIALS */
int pa_iochannel_creds_supported(pa_iochannel *io) {
return 0;
}
int pa_iochannel_creds_enable(pa_iochannel *io) {
return -1;
}
ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l) {
pa_log_error("pa_iochannel_write_with_creds() not supported.");
return -1;
}
ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, struct ucred *ucred, int *creds_valid) {
pa_log_error("pa_iochannel_read_with_creds() not supported.");
return -1;
}
#endif /* SCM_CREDENTIALS */
void pa_iochannel_set_callback(pa_iochannel*io, pa_iochannel_cb_t _callback, void *userdata) { void pa_iochannel_set_callback(pa_iochannel*io, pa_iochannel_cb_t _callback, void *userdata) {
assert(io); assert(io);

6
src/polypcore/iochannel.h
View file

@ -23,8 +23,6 @@
***/ ***/
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <polyp/mainloop-api.h> #include <polyp/mainloop-api.h>
@ -51,13 +49,13 @@ void pa_iochannel_free(pa_iochannel*io);
ssize_t pa_iochannel_write(pa_iochannel*io, const void*data, size_t l); ssize_t pa_iochannel_write(pa_iochannel*io, const void*data, size_t l);
ssize_t pa_iochannel_read(pa_iochannel*io, void*data, size_t l); ssize_t pa_iochannel_read(pa_iochannel*io, void*data, size_t l);
#ifdef SCM_CREDENTIALS
int pa_iochannel_creds_supported(pa_iochannel *io); int pa_iochannel_creds_supported(pa_iochannel *io);
int pa_iochannel_creds_enable(pa_iochannel *io); int pa_iochannel_creds_enable(pa_iochannel *io);
struct ucred;
ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l); ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l);
ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, struct ucred *ucred, int *creds_valid); ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, struct ucred *ucred, int *creds_valid);
#endif
int pa_iochannel_is_readable(pa_iochannel*io); int pa_iochannel_is_readable(pa_iochannel*io);
int pa_iochannel_is_writable(pa_iochannel*io); int pa_iochannel_is_writable(pa_iochannel*io);