diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-23 22:38:12 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-23 22:38:12 +0000 |
| commit | 755d3ab9a030abfad4d152c07400388f8d618540 (patch) | |
| tree | b8bce07270886f0d45f9c032b4c5615bd9d640ef /eth-filter | |
| parent | 9d7e429e251bf6deb7dda41b4d3434d3e5663428 (diff) | |
| parent | 55dbe0445180b7b6755ad014a6ee66f49da7f23d (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'eth-filter')
| -rw-r--r-- | eth-filter/filter.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 |