diff options
| -rw-r--r-- | devnode/devnode.c | 1 | ||||
| -rw-r--r-- | eth-filter/filter.c | 9 | ||||
| -rw-r--r-- | eth-multiplexer/device_impl.c | 4 | ||||
| -rw-r--r-- | libmachdev/ds_routines.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/devnode/devnode.c b/devnode/devnode.c index 218b3081..947d31b1 100644 --- a/devnode/devnode.c +++ b/devnode/devnode.c @@ -24,6 +24,7 @@ */ #include <argp.h> +#include <argz.h> #include <errno.h> #include <error.h> #include <stddef.h> diff --git a/eth-filter/filter.c b/eth-filter/filter.c index 7720b0c7..d2b1e39a 100644 --- a/eth-filter/filter.c +++ b/eth-filter/filter.c @@ -26,6 +26,7 @@ */ #include <argp.h> +#include <argz.h> #include <errno.h> #include <error.h> #include <stddef.h> @@ -37,6 +38,7 @@ #include <hurd/trivfs.h> #include <hurd/ports.h> #include <hurd/ihash.h> +#include <hurd/fshelp.h> #include "ourdevice_S.h" #include "notify_S.h" @@ -379,7 +381,7 @@ ds_device_write (device_t device, mach_port_t reply_port, user = ports_lookup_port (port_bucket, device, user_portclass); if (user == NULL) { - vm_deallocate (mach_task_self (), data, datalen); + vm_deallocate (mach_task_self (), (vm_address_t) data, datalen); return D_INVALID_OPERATION; } proxy = user->proxy; @@ -414,7 +416,7 @@ ds_device_write (device_t device, mach_port_t reply_port, *bytes_written = datalen; err = 0; } - vm_deallocate (mach_task_self (), data, datalen); + vm_deallocate (mach_task_self (), (vm_address_t) data, datalen); return err; } @@ -734,7 +736,6 @@ error_t trivfs_append_args (struct trivfs_control *fsys, char **argz, size_t *argz_len) { - error_t err; char *opt; if (device_file) @@ -779,6 +780,8 @@ trivfs_set_options (struct trivfs_control *fsys, char *argz, size_t argz_len) rcv_filter_length); if (err) return err; + + return 0; } int diff --git a/eth-multiplexer/device_impl.c b/eth-multiplexer/device_impl.c index 953fca70..459d9c4c 100644 --- a/eth-multiplexer/device_impl.c +++ b/eth-multiplexer/device_impl.c @@ -156,7 +156,7 @@ ds_device_write (device_t device, mach_port_t reply_port, vdev_portclass); if (vdev == NULL) { - vm_deallocate (mach_task_self (), data, datalen); + vm_deallocate (mach_task_self (), (vm_address_t) data, datalen); return D_NO_SUCH_DEVICE; } /* The packet is forwarded to all virtual interfaces and @@ -168,7 +168,7 @@ ds_device_write (device_t device, mach_port_t reply_port, data, datalen, bytes_written); /* The data in device_write() is transmifered out of line, * so the server-side function has to deallocate it. */ - vm_deallocate (mach_task_self (), data, datalen); + vm_deallocate (mach_task_self (), (vm_address_t) data, datalen); ports_port_deref (vdev); return ret; } diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c index 63457553..d22fb2fe 100644 --- a/libmachdev/ds_routines.c +++ b/libmachdev/ds_routines.c @@ -166,7 +166,7 @@ ds_device_open (mach_port_t open_port, mach_port_t reply_port, char *name, device_t *devp, mach_msg_type_name_t *devicePoly) { int i; - io_return_t err; + io_return_t err = D_NO_SUCH_DEVICE; /* Open must be called on the master device port. */ if (!is_master_device (open_port)) |