From c2ff0ae9d491a5d259bf0c2f7b36ecd49f1aa3b9 Mon Sep 17 00:00:00 2001 From: Adrian-Ken Rueegsegger Date: Thu, 12 Feb 2015 11:26:18 +0100 Subject: [PATCH] Minor cleanup fixes - Fix spelling errors - Remove extra semicolons - Remove extra spaces Fixes #1650 --- .../src/core/include/spec/arm/short_translation_table.h | 2 +- repos/base-linux/src/core/include/platform.h | 2 +- repos/base-linux/src/platform/linux_syscalls.h | 2 +- repos/base-sel4/src/core/platform.cc | 2 +- repos/base/src/lib/ldso/dependency.cc | 2 +- repos/base/src/lib/ldso/file.cc | 2 +- repos/base/src/lib/ldso/include/debug.h | 6 +++--- repos/base/src/platform/_main.cc | 4 ++-- repos/dde_linux/src/lib/libnl/lxcc_emul.cc | 2 +- repos/dde_linux/src/lib/lxip/include/lx_emul.h | 2 +- repos/dde_linux/src/lib/usb/dummies.c | 2 +- repos/dde_linux/src/lib/usb/input/evdev.c | 2 +- repos/gems/src/app/decorator/window.h | 2 +- repos/gems/src/server/terminal/main.cc | 2 +- repos/gems/src/server/terminal_mux/main.cc | 2 +- repos/os/src/drivers/acpi/acpi.cc | 4 ++-- repos/ports/src/virtualbox/libc.cc | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/repos/base-hw/src/core/include/spec/arm/short_translation_table.h b/repos/base-hw/src/core/include/spec/arm/short_translation_table.h index 5743132cd5..95003b4d4d 100644 --- a/repos/base-hw/src/core/include/spec/arm/short_translation_table.h +++ b/repos/base-hw/src/core/include/spec/arm/short_translation_table.h @@ -399,7 +399,7 @@ class Genode::Translation_table /** * Try to get entry index in 'i' for virtual offset 'vo! * - * \return wether it was successful + * \return whether it was successful */ bool _index_by_vo(unsigned & i, addr_t const vo) const { diff --git a/repos/base-linux/src/core/include/platform.h b/repos/base-linux/src/core/include/platform.h index 8001400d04..211f53658c 100644 --- a/repos/base-linux/src/core/include/platform.h +++ b/repos/base-linux/src/core/include/platform.h @@ -56,7 +56,7 @@ namespace Genode { Alloc_return alloc_addr(size_t, addr_t) { - return Alloc_return::OK;; + return Alloc_return::OK; } int add_range(addr_t, size_t) override { return 0; } diff --git a/repos/base-linux/src/platform/linux_syscalls.h b/repos/base-linux/src/platform/linux_syscalls.h index 702e370f57..af0486eec0 100644 --- a/repos/base-linux/src/platform/linux_syscalls.h +++ b/repos/base-linux/src/platform/linux_syscalls.h @@ -259,7 +259,7 @@ inline int lx_sigaction(int signum, void (*handler)(int)) */ enum { SA_RESTORER = 0x04000000 }; act.flags = SA_RESTORER; - act.restorer = lx_restore_rt;; + act.restorer = lx_restore_rt; #else act.flags = 0; act.restorer = 0; diff --git a/repos/base-sel4/src/core/platform.cc b/repos/base-sel4/src/core/platform.cc index 0688d0b16f..c7c91a642f 100644 --- a/repos/base-sel4/src/core/platform.cc +++ b/repos/base-sel4/src/core/platform.cc @@ -266,7 +266,7 @@ void Platform::_init_rom_modules() */ static long slab_block[4096]; static Tslab - rom_module_slab(core_mem_alloc(), (Genode::Slab_block *)slab_block);; + rom_module_slab(core_mem_alloc(), (Genode::Slab_block *)slab_block); /* * Allocate unused range of phys CNode address space where to make the diff --git a/repos/base/src/lib/ldso/dependency.cc b/repos/base/src/lib/ldso/dependency.cc index 40be09afd4..502e712c42 100644 --- a/repos/base/src/lib/ldso/dependency.cc +++ b/repos/base/src/lib/ldso/dependency.cc @@ -74,7 +74,7 @@ Linker::Root_object::Root_object(char const *path, unsigned flags) new (Genode::env()->heap()) Dependency(path, this, &dep, flags); /* provide Genode base library access */ - new (Genode::env()->heap()) Dependency(linker_name(), this, &dep);; + new (Genode::env()->heap()) Dependency(linker_name(), this, &dep); /* relocate and call constructors */ Init::list()->initialize(); diff --git a/repos/base/src/lib/ldso/file.cc b/repos/base/src/lib/ldso/file.cc index 8a523581e0..567fae75f4 100644 --- a/repos/base/src/lib/ldso/file.cc +++ b/repos/base/src/lib/ldso/file.cc @@ -145,7 +145,7 @@ struct Linker::Elf_file : File if (ehdr->e_ident[EI_CLASS] != ELFCLASS) { PERR("LD: support for 32/64-bit objects only"); - return false;; + return false; } return true; diff --git a/repos/base/src/lib/ldso/include/debug.h b/repos/base/src/lib/ldso/include/debug.h index c6cbe8e570..f6f0134bbf 100644 --- a/repos/base/src/lib/ldso/include/debug.h +++ b/repos/base/src/lib/ldso/include/debug.h @@ -43,8 +43,8 @@ struct Linker::Debug Debug() : Brk(brk) { } - int version = 1; /* unused */ - struct Link_map *map = nullptr;; /* start of link map */ + int version = 1; /* unused */ + struct Link_map *map = nullptr; /* start of link map */ /* * This is the address of a function internal to the run-time linker, that @@ -86,7 +86,7 @@ struct Linker::Link_map static void add(Link_map *map) { - map->next = nullptr;; + map->next = nullptr; if (!first) { first = map; Debug::d()->map = map; diff --git a/repos/base/src/platform/_main.cc b/repos/base/src/platform/_main.cc index 29a3f7924c..ddd068c3ba 100644 --- a/repos/base/src/platform/_main.cc +++ b/repos/base/src/platform/_main.cc @@ -104,7 +104,7 @@ int genode_atexit(void (*func)(void)) int error; fn.fn_type = ATEXIT_FN_STD; - fn.fn_ptr.std_func = func;; + fn.fn_ptr.std_func = func; fn.fn_arg = 0; fn.fn_dso = 0; @@ -127,7 +127,7 @@ int genode___cxa_atexit(void (*func)(void*), void *arg, void *dso) int error; fn.fn_type = ATEXIT_FN_CXA; - fn.fn_ptr.cxa_func = func;; + fn.fn_ptr.cxa_func = func; fn.fn_arg = arg; fn.fn_dso = dso; diff --git a/repos/dde_linux/src/lib/libnl/lxcc_emul.cc b/repos/dde_linux/src/lib/libnl/lxcc_emul.cc index 5fecbd22a7..67f6e018d0 100644 --- a/repos/dde_linux/src/lib/libnl/lxcc_emul.cc +++ b/repos/dde_linux/src/lib/libnl/lxcc_emul.cc @@ -324,7 +324,7 @@ int asprintf(char **strp, const char *fmt, ...) sc.vprintf(fmt, args); va_end(args); - return strlen(p);; + return strlen(p); } diff --git a/repos/dde_linux/src/lib/lxip/include/lx_emul.h b/repos/dde_linux/src/lib/lxip/include/lx_emul.h index af6c201f3a..35aa2fe8e3 100644 --- a/repos/dde_linux/src/lib/lxip/include/lx_emul.h +++ b/repos/dde_linux/src/lib/lxip/include/lx_emul.h @@ -1766,7 +1766,7 @@ char *strcat(char *dest, const char *src); int strcmp(const char *, const char *); int strncmp(const char *, const char *, size_t); char *strcpy(char *to, const char *from); -char * strncpy(char *,const char *, __kernel_size_t);; +char * strncpy(char *,const char *, __kernel_size_t); size_t strlcpy(char *dest, const char *src, size_t size); char * strsep(char **,const char *); diff --git a/repos/dde_linux/src/lib/usb/dummies.c b/repos/dde_linux/src/lib/usb/dummies.c index 9b48f36927..a00156ec75 100644 --- a/repos/dde_linux/src/lib/usb/dummies.c +++ b/repos/dde_linux/src/lib/usb/dummies.c @@ -668,7 +668,7 @@ void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, - enum dma_data_direction direction) { SKIP;; } + enum dma_data_direction direction) { SKIP; } int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { SKIP; return 0; } diff --git a/repos/dde_linux/src/lib/usb/input/evdev.c b/repos/dde_linux/src/lib/usb/input/evdev.c index d59e255491..e934b3b76e 100644 --- a/repos/dde_linux/src/lib/usb/input/evdev.c +++ b/repos/dde_linux/src/lib/usb/input/evdev.c @@ -27,7 +27,7 @@ #include /* Callback function to Genode subsystem */ -static genode_input_event_cb handler;; +static genode_input_event_cb handler; static unsigned long screen_x = 0; static unsigned long screen_y = 0; diff --git a/repos/gems/src/app/decorator/window.h b/repos/gems/src/app/decorator/window.h index e07b33da30..fa34cad1d4 100644 --- a/repos/gems/src/app/decorator/window.h +++ b/repos/gems/src/app/decorator/window.h @@ -376,7 +376,7 @@ void Decorator::Window::draw(Decorator::Canvas_base &canvas, _draw_title_box(canvas, title_rect, element(Element::TITLE).color()); - char const * const text = _title.string();; + char const * const text = _title.string(); Area const label_area(default_font().str_w(text), default_font().str_h(text)); diff --git a/repos/gems/src/server/terminal/main.cc b/repos/gems/src/server/terminal/main.cc index dbeff5d676..5151b38357 100644 --- a/repos/gems/src/server/terminal/main.cc +++ b/repos/gems/src/server/terminal/main.cc @@ -405,7 +405,7 @@ namespace Terminal { unsigned char *dst = _io_buffer.local_addr(); Genode::size_t dst_size = Genode::min(_io_buffer.size(), dst_len); do { - dst[num_bytes++] = _read_buffer->get();; + dst[num_bytes++] = _read_buffer->get(); } while (!_read_buffer->empty() && num_bytes < dst_size); return num_bytes; diff --git a/repos/gems/src/server/terminal_mux/main.cc b/repos/gems/src/server/terminal_mux/main.cc index 92e4661c4a..9c1dc3f23b 100644 --- a/repos/gems/src/server/terminal_mux/main.cc +++ b/repos/gems/src/server/terminal_mux/main.cc @@ -307,7 +307,7 @@ namespace Terminal { unsigned char *dst = _io_buffer.local_addr(); Genode::size_t dst_size = Genode::min(_io_buffer.size(), dst_len); do { - dst[num_bytes++] = _read_buffer.get();; + dst[num_bytes++] = _read_buffer.get(); } while (!_read_buffer.empty() && num_bytes < dst_size); return num_bytes; diff --git a/repos/os/src/drivers/acpi/acpi.cc b/repos/os/src/drivers/acpi/acpi.cc index b938636240..4938da4f3d 100644 --- a/repos/os/src/drivers/acpi/acpi.cc +++ b/repos/os/src/drivers/acpi/acpi.cc @@ -315,9 +315,9 @@ class Table_wrapper void parse_dmar() const { Dmar_struct_header *head = _table->dmar_header(); - PLOG("%u bit DMA physical addressable %s\n", head->width + 1, + PLOG("%u bit DMA physical addressable%s\n", head->width + 1, head->flags & Dmar_struct_header::INTR_REMAP_MASK ? - ", IRQ remapping supported" : ""); + " , IRQ remapping supported" : ""); Dmar_struct *dmar = _table->dmar_struct(); for (; dmar < _table->dmar_end(); dmar = dmar->next()) diff --git a/repos/ports/src/virtualbox/libc.cc b/repos/ports/src/virtualbox/libc.cc index f44a388825..0c8b3d1cc8 100644 --- a/repos/ports/src/virtualbox/libc.cc +++ b/repos/ports/src/virtualbox/libc.cc @@ -138,7 +138,7 @@ extern "C" int sigaction(int signum, const struct sigaction *act, { /* * Break infinite loop at 'VBox/Runtime/r3/init.cpp' :451 - */; + */ if (oldact) oldact->sa_flags = SA_SIGINFO;