[fdio] Remove unused header declarations
These functions either no longer exist or are used only in one
compilation unit.
Test: No behavior change
Change-Id: I91901b9d344060c84a5b4cf00433064c888592a9
diff --git a/system/ulib/fdio/private.h b/system/ulib/fdio/private.h
index d95ab78..85354a9 100644
--- a/system/ulib/fdio/private.h
+++ b/system/ulib/fdio/private.h
@@ -131,8 +131,6 @@
// Wraps a socket with an fdio_t using socketpair io.
fdio_t* fdio_socketpair_create(zx_handle_t h);
-zx_status_t fdio_pipe_posix_ioctl(fdio_t* io, int req, va_list va);
-
// Wraps a vmo, offset, length with an fdio_t providing a readonly file.
// Takens ownership of h.
fdio_t* fdio_vmofile_create(zx_handle_t h, zx_handle_t vmo, zx_off_t off, zx_off_t len);
@@ -158,10 +156,6 @@
void fdio_socket_set_stream_ops(fdio_t* io);
void fdio_socket_set_dgram_ops(fdio_t* io);
-zx_status_t fdio_socket_posix_ioctl(fdio_t* io, int req, va_list va);
-zx_status_t fdio_socket_shutdown(fdio_t* io, int how);
-zx_status_t fdio_socketpair_shutdown(fdio_t* io, int how);
-
// unsupported / do-nothing hooks shared by implementations
zx_status_t fdio_default_get_token(fdio_t* io, zx_handle_t* out);
zx_status_t fdio_default_set_attr(fdio_t* io, const vnattr_t* attr);
@@ -206,12 +200,6 @@
ssize_t fdio_default_posix_ioctl(fdio_t* io, int req, va_list va);
zx_status_t fdio_default_get_vmo(fdio_t* io, int flags, zx_handle_t* out);
-void __fdio_startup_handles_init(uint32_t num, zx_handle_t handles[],
- uint32_t handle_info[])
- __attribute__((visibility("hidden")));
-
-void __fdio_rchannel_init(void) __attribute__((visibility("hidden")));
-
typedef struct {
mtx_t lock;
mtx_t cwd_lock;
diff --git a/system/ulib/fdio/socket.c b/system/ulib/fdio/socket.c
index 687822c..9650e23 100644
--- a/system/ulib/fdio/socket.c
+++ b/system/ulib/fdio/socket.c
@@ -738,6 +738,31 @@
return r;
}
+static zx_status_t fdio_socket_shutdown(fdio_t* io, int how) {
+ if (!(io->ioflag & IOFLAG_SOCKET_CONNECTED)) {
+ return ZX_ERR_BAD_STATE;
+ }
+ zxsio_t* sio = (zxsio_t*)io;
+ if (how == SHUT_WR || how == SHUT_RDWR) {
+ // netstack expects this user signal to be set - raise it to keep that code working until
+ // it learns about the read/write disabled signals.
+ zx_object_signal_peer(sio->s, 0u, ZXSIO_SIGNAL_HALFCLOSED);
+ }
+ uint32_t options = 0;
+ switch (how) {
+ case SHUT_RD:
+ options = ZX_SOCKET_SHUTDOWN_READ;
+ break;
+ case SHUT_WR:
+ options = ZX_SOCKET_SHUTDOWN_WRITE;
+ break;
+ case SHUT_RDWR:
+ options = ZX_SOCKET_SHUTDOWN_READ | ZX_SOCKET_SHUTDOWN_WRITE;
+ break;
+ }
+ return zx_socket_write(sio->s, options, NULL, 0, NULL);
+}
+
static fdio_ops_t fdio_socket_stream_ops = {
.read = zxsio_read_stream,
.read_at = fdio_default_read_at,
@@ -832,28 +857,3 @@
zxsio_t* sio = (zxsio_t*)io;
sio->io.ops = &fdio_socket_dgram_ops;
}
-
-zx_status_t fdio_socket_shutdown(fdio_t* io, int how) {
- if (!(io->ioflag & IOFLAG_SOCKET_CONNECTED)) {
- return ZX_ERR_BAD_STATE;
- }
- zxsio_t* sio = (zxsio_t*)io;
- if (how == SHUT_WR || how == SHUT_RDWR) {
- // netstack expects this user signal to be set - raise it to keep that code working until
- // it learns about the read/write disabled signals.
- zx_object_signal_peer(sio->s, 0u, ZXSIO_SIGNAL_HALFCLOSED);
- }
- uint32_t options = 0;
- switch (how) {
- case SHUT_RD:
- options = ZX_SOCKET_SHUTDOWN_READ;
- break;
- case SHUT_WR:
- options = ZX_SOCKET_SHUTDOWN_WRITE;
- break;
- case SHUT_RDWR:
- options = ZX_SOCKET_SHUTDOWN_READ | ZX_SOCKET_SHUTDOWN_WRITE;
- break;
- }
- return zx_socket_write(sio->s, options, NULL, 0, NULL);
-}
