From 7e19ef6644d16689604d1d5c34702cb21b25f6d6 Mon Sep 17 00:00:00 2001 From: Alexandre Ratchov Date: Sat, 4 Nov 2017 09:14:29 +0100 Subject: [PATCH] Make *_getfd() and *_fdopen() public. This allows pledged sndiod to build with the portable library. --- libsndio/mio_rmidi.c | 5 ++++- libsndio/sio_sun.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libsndio/mio_rmidi.c b/libsndio/mio_rmidi.c index 6ffef85..e337b2e 100644 --- a/libsndio/mio_rmidi.c +++ b/libsndio/mio_rmidi.c @@ -135,11 +135,14 @@ mio_rmidi_getfd(const char *str, unsigned int mode, int nbio) return fd; } -static struct mio_hdl * +struct mio_hdl * mio_rmidi_fdopen(int fd, unsigned int mode, int nbio) { struct mio_rmidi_hdl *hdl; +#ifdef DEBUG + _sndio_debug_init(); +#endif hdl = malloc(sizeof(struct mio_rmidi_hdl)); if (hdl == NULL) return NULL; diff --git a/libsndio/sio_sun.c b/libsndio/sio_sun.c index e32cf40..6901b5d 100644 --- a/libsndio/sio_sun.c +++ b/libsndio/sio_sun.c @@ -267,7 +267,7 @@ sio_sun_getcap(struct sio_hdl *sh, struct sio_cap *cap) return 1; } -static int +int sio_sun_getfd(const char *str, unsigned int mode, int nbio) { const char *p; @@ -275,6 +275,9 @@ sio_sun_getfd(const char *str, unsigned int mode, int nbio) unsigned int devnum; int fd, flags; +#ifdef DEBUG + _sndio_debug_init(); +#endif p = _sndio_parsetype(str, "rsnd"); if (p == NULL) { DPRINTF("sio_sun_getfd: %s: \"rsnd\" expected\n", str); @@ -307,11 +310,14 @@ sio_sun_getfd(const char *str, unsigned int mode, int nbio) return fd; } -static struct sio_hdl * +struct sio_hdl * sio_sun_fdopen(int fd, unsigned int mode, int nbio) { struct sio_sun_hdl *hdl; +#ifdef DEBUG + _sndio_debug_init(); +#endif hdl = malloc(sizeof(struct sio_sun_hdl)); if (hdl == NULL) return NULL;