The comment says there is nothing to deallocate and TODO_REMOVE_ME is nowhere defined, so I guess this destructor is no longer called.
* i386/i386/io_perm.c (io_perm_deallocate): Remove definition. * i386/i386/io_perm.h (io_perm_deallocate): Remove prototype. (_I386_IO_PERM_H_): Add comment after endif. * i386/include/mach/i386/mach_i386.defs (io_perm_deallocate): Remove. --- i386/i386/io_perm.c | 12 ------------ i386/i386/io_perm.h | 5 +---- i386/include/mach/i386/mach_i386.defs | 3 --- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/i386/i386/io_perm.c b/i386/i386/io_perm.c index 8bacb8d..dabba35 100644 --- a/i386/i386/io_perm.c +++ b/i386/i386/io_perm.c @@ -106,18 +106,6 @@ convert_port_to_io_perm (ipc_port_t port) return io_perm; } -#if TODO_REMOVE_ME -/* TODO. Fix this comment. */ -/* The destructor which is called when the last send right to a port - representing an io_perm_t object vanishes. */ -void -io_perm_deallocate (io_perm_t io_perm) -{ - /* TODO. Is there anything to deallocate in here? I don't think so, as we - don't allocate anything in `convert_port_to_io_perm'. */ -} -#endif - /* Our ``no senders'' handling routine. Deallocate the object. */ static void diff --git a/i386/i386/io_perm.h b/i386/i386/io_perm.h index a68e103..8fabb1f 100644 --- a/i386/i386/io_perm.h +++ b/i386/i386/io_perm.h @@ -58,8 +58,5 @@ typedef struct io_perm *io_perm_t; extern io_perm_t convert_port_to_io_perm (ipc_port_t); extern ipc_port_t convert_io_perm_to_port (io_perm_t); -#if TODO_REMOVE_ME -extern void io_perm_deallocate (io_perm_t); -#endif -#endif +#endif /* _I386_IO_PERM_H_ */ diff --git a/i386/include/mach/i386/mach_i386.defs b/i386/include/mach/i386/mach_i386.defs index 0703d59..cd09720 100644 --- a/i386/include/mach/i386/mach_i386.defs +++ b/i386/include/mach/i386/mach_i386.defs @@ -51,9 +51,6 @@ type io_perm_t = mach_port_t #if KERNEL_SERVER intran: io_perm_t convert_port_to_io_perm(mach_port_t) outtran: mach_port_t convert_io_perm_to_port(io_perm_t) -#if TODO_REMOVE_ME - destructor: io_perm_deallocate(io_perm_t) -#endif #endif /* KERNEL_SERVER */ ; -- 1.8.1.4