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. --- ddb/db_elf.c | 2 +- device/ds_routines.c | 4 ++-- i386/i386/user_ldt.c | 11 +++++------ i386/i386/xen.h | 2 +- i386/intel/pmap.c | 8 ++++---- ipc/ipc_kmsg.c | 2 +- kern/boot_script.c | 3 ++- kern/bootstrap.c | 5 +++-- kern/host.c | 2 +- kern/ipc_tt.c | 2 +- kern/mach_clock.c | 6 +++--- kern/processor.c | 2 +- kern/strings.c | 2 +- kern/task.c | 2 +- kern/thread.c | 4 ++-- vm/memory_object.c | 2 +- xen/block.c | 8 ++++---- xen/console.c | 7 +++---- xen/console.h | 6 +++--- xen/evt.c | 3 ++- xen/net.c | 4 ++-- 21 files changed, 44 insertions(+), 43 deletions(-) diff --git a/ddb/db_elf.c b/ddb/db_elf.c index 10e71621..547453b3 100644 --- a/ddb/db_elf.c +++ b/ddb/db_elf.c @@ -82,7 +82,7 @@ elf_db_sym_init (unsigned shdr_num, { Elf32_Shdr *shdr, *symtab, *strtab; const char *shstrtab; - int i; + unsigned i; if (shdr_num == 0) return FALSE; diff --git a/device/ds_routines.c b/device/ds_routines.c index dbff7f89..6b6dcb03 100644 --- a/device/ds_routines.c +++ b/device/ds_routines.c @@ -140,7 +140,7 @@ ds_device_open (ipc_port_t open_port, ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, dev_mode_t mode, char *name, device_t *devp) { - int i; + unsigned i; io_return_t err; /* Open must be called on the master device port. */ @@ -1715,7 +1715,7 @@ device_writev_trap (mach_device_t device, dev_mode_t mode, io_return_t result; io_buf_vec_t stack_iovec[16]; /* XXX */ vm_size_t data_count; - int i; + unsigned i; if (device->state != DEV_STATE_OPEN) return (D_NO_SUCH_DEVICE); diff --git a/i386/i386/user_ldt.c b/i386/i386/user_ldt.c index d8bdb90f..e7705b52 100644 --- a/i386/i386/user_ldt.c +++ b/i386/i386/user_ldt.c @@ -57,11 +57,11 @@ i386_set_ldt( { user_ldt_t new_ldt, old_ldt, temp; struct real_descriptor *dp; - int i; - int min_selector = 0; + unsigned i; + unsigned min_selector = 0; pcb_t pcb; vm_size_t ldt_size_needed; - int first_desc = sel_idx(first_selector); + unsigned first_desc = sel_idx(first_selector); vm_map_copy_t old_copy_object = NULL; /* Suppress gcc warning */ if (thread == THREAD_NULL) @@ -224,7 +224,6 @@ i386_set_ldt( if (new_ldt) #ifdef MACH_PV_DESCRIPTORS { - int i; #ifdef MACH_PV_PAGETABLES for (i=0; i<(new_ldt->desc.limit_low + 1)/sizeof(struct real_descriptor); i+=PAGE_SIZE/sizeof(struct real_descriptor)) pmap_set_page_readwrite(&new_ldt->ldt[i]); @@ -264,7 +263,7 @@ i386_get_ldt(thread, first_selector, selector_count, desc_list, count) struct user_ldt *user_ldt; pcb_t pcb; int first_desc = sel_idx(first_selector); - unsigned int ldt_count; + unsigned ldt_count; vm_size_t ldt_size; vm_size_t size, size_needed; vm_offset_t addr; @@ -370,7 +369,7 @@ void user_ldt_free(user_ldt_t user_ldt) { #ifdef MACH_PV_DESCRIPTORS - int i; + unsigned i; #ifdef MACH_PV_PAGETABLES for (i=0; i<(user_ldt->desc.limit_low + 1)/sizeof(struct real_descriptor); i+=PAGE_SIZE/sizeof(struct real_descriptor)) pmap_set_page_readwrite(&user_ldt->ldt[i]); diff --git a/i386/i386/xen.h b/i386/i386/xen.h index 49b0d52f..b434ddaf 100644 --- a/i386/i386/xen.h +++ b/i386/i386/xen.h @@ -260,7 +260,7 @@ MACH_INLINE void hyp_set_ldt(void *ldt, unsigned long nbentries) { .arg1.linear_addr = kvtolin(ldt), .arg2.nr_ents = nbentries, }; - int count; + unsigned long count; if (((unsigned long)ldt) & PAGE_MASK) panic("ldt %p is not aligned on a page\n", ldt); for (count=0; countdirbase = kernel_page_dir = (pt_entry_t*)phystokv(pmap_grab_page()); #endif /* PAE */ { - int i; + unsigned i; for (i = 0; i < NPDES; i++) kernel_pmap->dirbase[i] = 0; } @@ -678,7 +678,7 @@ void pmap_bootstrap(void) l2_map += (la >> PDESHIFT) & PDEMASK; if (!(*l2_map & INTEL_PTE_VALID)) { struct mmu_update update; - int j, n; + unsigned j, n; l1_map[n_l1map] = (pt_entry_t*) phystokv(pmap_grab_page()); for (j = 0; j < NPTES; j++) @@ -857,11 +857,11 @@ void pmap_set_page_readonly_init(void *_vaddr) { } void pmap_clear_bootstrap_pagetable(pt_entry_t *base) { - int i; + unsigned i; pt_entry_t *dir; vm_offset_t va = 0; #if PAE - int j; + unsigned j; #endif /* PAE */ if (!hyp_mmuext_op_mfn (MMUEXT_UNPIN_TABLE, kv_to_mfn(base))) panic("pmap_clear_bootstrap_pagetable: couldn't unpin page %p(%p)\n", base, (vm_offset_t) kv_to_ma(base)); diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c index 21667cae..28ed23c6 100644 --- a/ipc/ipc_kmsg.c +++ b/ipc/ipc_kmsg.c @@ -2857,7 +2857,7 @@ ipc_msg_print(mach_msg_header_t *msgh) if (is_inline) { vm_size_t amount; - int i, numwords; + unsigned i, numwords; /* inline data sizes round up to int boundaries */ amount = (length + 3) &~ 3; diff --git a/kern/boot_script.c b/kern/boot_script.c index b245d1d8..b2ae901c 100644 --- a/kern/boot_script.c +++ b/kern/boot_script.c @@ -294,7 +294,8 @@ boot_script_parse_line (void *hook, char *cmdline) for (p += 2;;) { char c; - int i, type; + unsigned i; + int type; long val; struct sym *s; diff --git a/kern/bootstrap.c b/kern/bootstrap.c index 08362767..7398ea44 100644 --- a/kern/bootstrap.c +++ b/kern/bootstrap.c @@ -124,7 +124,7 @@ free_bootstrap_pages(phys_addr_t start, phys_addr_t end) void bootstrap_create(void) { int compat; - int n = 0; + unsigned n = 0; #ifdef MACH_XEN struct multiboot_module *bmods = ((struct multiboot_module *) boot_info.mod_start); @@ -164,7 +164,8 @@ void bootstrap_create(void) } else { - int i, losers; + unsigned i; + int losers; /* Initialize boot script variables. We leak these send rights. */ losers = boot_script_set_variable diff --git a/kern/host.c b/kern/host.c index 2855cd2d..57280c49 100644 --- a/kern/host.c +++ b/kern/host.c @@ -51,7 +51,7 @@ kern_return_t host_processors( processor_array_t *processor_list, natural_t *countp) { - int i; + unsigned i; processor_t *tp; vm_offset_t addr; unsigned int count; diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c index e4d657b7..04a5a92f 100644 --- a/kern/ipc_tt.c +++ b/kern/ipc_tt.c @@ -818,7 +818,7 @@ mach_ports_register( mach_msg_type_number_t portsCnt) { ipc_port_t ports[TASK_PORT_REGISTER_MAX]; - int i; + unsigned i; if ((task == TASK_NULL) || (portsCnt > TASK_PORT_REGISTER_MAX)) diff --git a/kern/mach_clock.c b/kern/mach_clock.c index d6ebf23e..e4d44f57 100644 --- a/kern/mach_clock.c +++ b/kern/mach_clock.c @@ -74,11 +74,11 @@ int timedelta = 0; int tickdelta = 0; #if HZ > 500 -int tickadj = 1; /* can adjust HZ usecs per second */ +unsigned tickadj = 1; /* can adjust HZ usecs per second */ #else -int tickadj = 500 / HZ; /* can adjust 100 usecs per second */ +unsigned tickadj = 500 / HZ; /* can adjust 100 usecs per second */ #endif -int bigadj = 1000000; /* adjust 10*tickadj if adjustment +unsigned bigadj = 1000000; /* adjust 10*tickadj if adjustment > bigadj */ /* diff --git a/kern/processor.c b/kern/processor.c index 0a88469b..dffd7d0b 100644 --- a/kern/processor.c +++ b/kern/processor.c @@ -849,7 +849,7 @@ processor_set_things( int type) { unsigned int actual; /* this many things */ - int i; + unsigned i; vm_size_t size, size_needed; vm_offset_t addr; diff --git a/kern/strings.c b/kern/strings.c index e299534a..64410d91 100644 --- a/kern/strings.c +++ b/kern/strings.c @@ -184,7 +184,7 @@ memset( void *_s, int c, size_t n) { char *s = _s; - int i; + size_t i; for (i = 0; i < n ; i++) s[i] = c; diff --git a/kern/task.c b/kern/task.c index 0f24e44d..d721f172 100644 --- a/kern/task.c +++ b/kern/task.c @@ -565,7 +565,7 @@ kern_return_t task_threads( unsigned int actual; /* this many threads */ thread_t thread; thread_t *threads; - int i; + unsigned i; vm_size_t size, size_needed; vm_offset_t addr; diff --git a/kern/thread.c b/kern/thread.c index ce44ed14..a8211491 100644 --- a/kern/thread.c +++ b/kern/thread.c @@ -2332,7 +2332,7 @@ void consider_thread_collect(void) vm_size_t stack_usage( vm_offset_t stack) { - int i; + unsigned i; for (i = 0; i < KERNEL_STACK_SIZE/sizeof(unsigned int); i++) if (((unsigned int *)stack)[i] != STACK_MARKER) @@ -2350,7 +2350,7 @@ void stack_init( vm_offset_t stack) { if (stack_check_usage) { - int i; + unsigned i; for (i = 0; i < KERNEL_STACK_SIZE/sizeof(unsigned int); i++) ((unsigned int *)stack)[i] = STACK_MARKER; diff --git a/vm/memory_object.c b/vm/memory_object.c index 097ed23d..7d33201b 100644 --- a/vm/memory_object.c +++ b/vm/memory_object.c @@ -704,7 +704,7 @@ memory_object_lock_request( #define PAGEOUT_PAGES \ MACRO_BEGIN \ vm_map_copy_t copy; \ - int i; \ + unsigned i; \ vm_page_t hp; \ \ vm_object_unlock(object); \ diff --git a/xen/block.c b/xen/block.c index 46df3589..7d6f1ca3 100644 --- a/xen/block.c +++ b/xen/block.c @@ -247,7 +247,7 @@ void hyp_block_init(void) { /* Allocate an event channel and give it to backend. */ bd->evt = evt = hyp_event_channel_alloc(domid); hyp_evt_handler(evt, hyp_block_intr, n, SPL7); - i = sprintf(port_name, "%lu", evt); + i = sprintf(port_name, "%u", evt); c = hyp_store_write(t, port_name, 5, VBD_PATH, "/", vbds[n], "/", "event-channel"); if (!c) panic("%s: couldn't store event channel (%s)", device_name, hyp_store_error); @@ -351,7 +351,7 @@ static io_return_t device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, dev_mode_t mode, char *name, device_t *devp /* out */) { - int i, err = 0; + int i; ipc_port_t port, notify; struct block_data *bd; @@ -569,13 +569,13 @@ device_write(void *d, ipc_port_t reply_port, io_return_t err = 0; vm_map_copy_t copy = (vm_map_copy_t) data; vm_offset_t aligned_buffer = 0; - int copy_npages = atop(round_page(count)); + unsigned copy_npages = atop(round_page(count)); vm_offset_t phys_addrs[copy_npages]; struct block_data *bd = d; blkif_request_t *req; grant_ref_t gref[BLKIF_MAX_SEGMENTS_PER_REQUEST]; unsigned reqn, size; - int i, nbpages, j; + unsigned i, nbpages, j; if (!(bd->mode & D_WRITE)) return D_READ_ONLY; 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) diff --git a/xen/console.h b/xen/console.h index 061ba281..c129bd4a 100644 --- a/xen/console.h +++ b/xen/console.h @@ -40,9 +40,9 @@ extern int hypcnprobe(struct consdev *cp); extern int hypcninit(struct consdev *cp); extern int hypcnopen(dev_t dev, int flag, io_req_t ior); -extern int hypcnread(int dev, io_req_t ior); -extern int hypcnwrite(int dev, io_req_t ior); -extern int hypcnclose(int dev, int flag); +extern int hypcnread(dev_t dev, io_req_t ior); +extern int hypcnwrite(dev_t dev, io_req_t ior); +extern void hypcnclose(int dev, int flag); extern io_return_t hypcngetstat(dev_t dev, int flavor, int *data, unsigned int *count); extern io_return_t hypcnsetstat(dev_t dev, int flavor, int *data, unsigned int count); extern int hypcnportdeath(dev_t dev, mach_port_t port); diff --git a/xen/evt.c b/xen/evt.c index c62e1d59..2a84ef77 100644 --- a/xen/evt.c +++ b/xen/evt.c @@ -77,7 +77,8 @@ void hyp_c_callback(void *ret_addr, void *regs) void form_int_mask(void) { - unsigned int i, j, bit, mask; + unsigned int j, bit, mask; + int i; for (i=SPL0; i < NSPL; i++) { for (j=0x00, bit=0x01, mask = 0; j < NEVNT; j++, bit<<=1) diff --git a/xen/net.c b/xen/net.c index 7181d780..5a3f90d9 100644 --- a/xen/net.c +++ b/xen/net.c @@ -395,7 +395,7 @@ void hyp_net_init(void) { /* Allocate an event channel and give it to backend. */ nd->evt = evt = hyp_event_channel_alloc(domid); - i = sprintf(port_name, "%lu", evt); + i = sprintf(port_name, "%u", evt); c = hyp_store_write(t, port_name, 5, VIF_PATH, "/", vifs[n], "/", "event-channel"); if (!c) panic("eth: couldn't store event channel for VIF %s (%s)", vifs[n], hyp_store_error); @@ -538,7 +538,7 @@ static io_return_t device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, dev_mode_t mode, char *name, device_t *devp /* out */) { - int i, n, err = 0; + int i, n; ipc_port_t port, notify; struct net_data *nd; -- cgit v1.2.3