From 51f386d08a87172ec7f83ab08b23c61c692f0058 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Aug 2015 11:07:23 -0600 Subject: [PATCH] Fix more common typos --- ChangeLog | 4 ++-- arch | 2 +- drivers/usbdev/usbdev_strings.c | 6 +++--- include/nuttx/binfmt/elf.h | 2 +- include/nuttx/binfmt/nxflat.h | 2 +- libc/stdio/lib_fopen.c | 2 +- sched/Kconfig | 2 +- sched/group/group_setupstreams.c | 2 +- sched/task/task_spawnparms.c | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1812628b4d..3acfa4f652 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1233,7 +1233,7 @@ macros definitions (patch submitted by Tiago Maluta). * Documents/NuttxPortingGuide.html, configs/README.txt, etc. - Replaced CONFIG_EXAMPLE with CONFIG_APP_DIR (see documents for - desciption). This allows NuttX application code to be built + description). This allows NuttX application code to be built outside of the examples/ directory. For people who have their own configurations and/or Makefiles, @@ -1325,7 +1325,7 @@ * configs/avr32dev1/nsh: Added a configuration to support the NuttShell (NSH). As of this writing, here is a problem receiving serial data (this is, very likely, my hardware setup). - * lib/lib_open.c: Fix an error in fdopen when a valid file desciptor does + * lib/lib_open.c: Fix an error in fdopen when a valid file descriptor does not refer to an open file. * configs/olimex-lpc1766stk: Add support for the Olimex LPC1766-STK development board. The OS test and NSH configurations (only) have been diff --git a/arch b/arch index 97e57f60e9..a7a7a7c6dd 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 97e57f60e929eb6e7be76edcfad4f67e8714ef25 +Subproject commit a7a7a7c6dd4f36f690139bc457064e6b24d009eb diff --git a/drivers/usbdev/usbdev_strings.c b/drivers/usbdev/usbdev_strings.c index 94771369b9..9dc9afdc40 100644 --- a/drivers/usbdev/usbdev_strings.c +++ b/drivers/usbdev/usbdev_strings.c @@ -49,7 +49,7 @@ * Public Data ****************************************************************************/ -/* Class API call strings that may be enabled for more desciptive USB trace +/* Class API call strings that may be enabled for more descriptive USB trace * output. */ @@ -72,7 +72,7 @@ const struct trace_msg_t g_usb_trace_strings_clsapi[] = TRACE_STR_END }; -/* Class state strings that may be enabled for more desciptive USB trace +/* Class state strings that may be enabled for more descriptive USB trace * output. */ @@ -97,7 +97,7 @@ const struct trace_msg_t g_usb_trace_strings_clsstate[] = TRACE_STR_END }; -/* Class error strings that may be enabled for more desciptive USB trace +/* Class error strings that may be enabled for more descriptive USB trace * output. */ diff --git a/include/nuttx/binfmt/elf.h b/include/nuttx/binfmt/elf.h index ed42499356..982fc4462d 100644 --- a/include/nuttx/binfmt/elf.h +++ b/include/nuttx/binfmt/elf.h @@ -86,7 +86,7 @@ * Public Types ****************************************************************************/ -/* This struct provides a desciption of the currently loaded instantiation +/* This struct provides a description of the currently loaded instantiation * of an ELF binary. */ diff --git a/include/nuttx/binfmt/nxflat.h b/include/nuttx/binfmt/nxflat.h index 8e661115b0..eb039f40a1 100644 --- a/include/nuttx/binfmt/nxflat.h +++ b/include/nuttx/binfmt/nxflat.h @@ -56,7 +56,7 @@ * Public Types ****************************************************************************/ -/* This struct provides a desciption of the currently loaded instantiation +/* This struct provides a description of the currently loaded instantiation * of an nxflat binary. */ diff --git a/libc/stdio/lib_fopen.c b/libc/stdio/lib_fopen.c index 62cada68a6..a29140ebae 100644 --- a/libc/stdio/lib_fopen.c +++ b/libc/stdio/lib_fopen.c @@ -294,7 +294,7 @@ FAR FILE *fopen(FAR const char *path, FAR const char *mode) fd = open(path, oflags, 0666); /* If the open was successful, then fdopen() the fil using the file - * desciptor returned by open. If open failed, then just return the + * descriptor returned by open. If open failed, then just return the * NULL stream -- open() has already set the errno. */ diff --git a/sched/Kconfig b/sched/Kconfig index be15080ea4..941026ffa1 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -606,7 +606,7 @@ config SDCLONE_DISABLE default n ---help--- Disable cloning of all socket - desciptors by task_create() when a new task is started. If + descriptors by task_create() when a new task is started. If set, all sockets will appear to be closed in the new task. config NFILE_DESCRIPTORS diff --git a/sched/group/group_setupstreams.c b/sched/group/group_setupstreams.c index 72fc12dd6e..292f0a6fe4 100644 --- a/sched/group/group_setupstreams.c +++ b/sched/group/group_setupstreams.c @@ -68,7 +68,7 @@ * * Description: * Setup streams data structures that may be used for standard C buffered - * I/O with underlying socket or file desciptors + * I/O with underlying socket or file descriptors * ****************************************************************************/ diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c index 8e1b0318fb..df0946c2fb 100644 --- a/sched/task/task_spawnparms.c +++ b/sched/task/task_spawnparms.c @@ -127,7 +127,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action) } /* Does the return file descriptor happen to match the required file - * desciptor number? + * descriptor number? */ else if (fd != action->fd)