From a7f248bf76dc0cabd1581143e9f4aa6454c91655 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 18 May 2016 02:25:28 +0200 Subject: Fix gcc-6 warnings * ddb/db_elf.c (elf_db_sym_init): Turn `i' into unsigned. * device/ds_routines.c (ds_device_open, device_writev_trap): Likewise. * i386/i386/user_ldt.c (i386_set_ldt): Likewise for `i', `min_selector', and `first_desc'. (i386_get_ldt): Likewise for `ldt_count'. (user_ldt_free): Likewise for `i'. * i386/i386/xen.h (hyp_set_ldt): Turn `count' into unsigned long. * i386/intel/pmap.c (pmap_bootstrap): Turn `i', `j' and 'n' into unsigned. (pmap_clear_bootstrap_pagetable): Likewise for `i' and `j'. * ipc/ipc_kmsg.c (ipc_msg_print): Turn `i' and `numwords' into unsigned. * kern/boot_script.c (boot_script_parse_line): Likewise for `i'. * kern/bootstrap.c (bootstrap_create): Likewise for `n' and `i'. * kern/host.c (host_processors): Likewise for `i'. * kern/ipc_tt.c (mach_ports_register): Likewise. * kern/mach_clock.c (tickadj, bigadj): turn into unsigned. * kern/processor.c (processor_set_things): Turn `i' into unsigned. * kern/task.c (task_threads): Likewise. * kern/thread.c (consider_thread_collect, stack_init): Likewise. * kern/strings.c (memset): Turn `i' into size_t. * vm/memory_object.c (memory_object_lock_request): Turn `i' into unsigned. * xen/block.c (hyp_block_init): Use %u format for evt. (device_open): Drop unused err variable. (device_write): Turn `copy_npages', `i', `nbpages', and `j' into unsigned. * xen/console.c (hypcnread, hypcnwrite, hypcnclose): Turn dev to dev_t. (hypcnclose): Return void. * xen/console.h (hypcnread, hypcnwrite, hypcnclose): Fix prototypes accordingly. * xen/evt.c (form_int_mask): Turn `i' into int. * xen/net.c (hyp_net_init): Use %u format for evt. (device_open): Remove unused `err' variable. --- xen/console.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xen/console.c') diff --git a/xen/console.c b/xen/console.c index 313b9342..9e8db8f8 100644 --- a/xen/console.c +++ b/xen/console.c @@ -129,14 +129,14 @@ static void hypcnintr(int unit, spl_t spl, void *ret_addr, void *regs) { simple_unlock(&inlock); } -int hypcnread(int dev, io_req_t ior) +int hypcnread(dev_t dev, io_req_t ior) { struct tty *tp = &hypcn_tty; tp->t_state |= TS_CARR_ON; return char_read(tp, ior); } -int hypcnwrite(int dev, io_req_t ior) +int hypcnwrite(dev_t dev, io_req_t ior) { return char_write(&hypcn_tty, ior); } @@ -207,7 +207,7 @@ int hypcnopen(dev_t dev, int flag, io_req_t ior) return (char_open(dev, tp, flag, ior)); } -int hypcnclose(int dev, int flag) +void hypcnclose(dev_t dev, int flag) { struct tty *tp = &hypcn_tty; spl_t s = spltty(); @@ -215,7 +215,6 @@ int hypcnclose(int dev, int flag) ttyclose(tp); simple_unlock(&tp->t_lock); splx(s); - return 0; } int hypcnprobe(struct consdev *cp) -- cgit v1.2.3