[rtems commit] Misc: Minor English fixes (GCI 2018)

Joel Sherrill joel at rtems.org
Tue Nov 20 15:46:18 UTC 2018


Module:    rtems
Branch:    master
Commit:    bde6ac2060a955f8aa4802cd5e1c5abd759534e0
Changeset: http://git.rtems.org/rtems/commit/?id=bde6ac2060a955f8aa4802cd5e1c5abd759534e0

Author:    kuaLeYi <kualeyidxa at gmail.com>
Date:      Tue Nov 20 09:45:51 2018 -0600

Misc: Minor English fixes (GCI 2018)

---

 cpukit/ftpd/ftpd.c               | 18 +++++++++---------
 cpukit/libdrvmgr/README          | 18 +++++++++---------
 make/leaf.cfg                    |  4 ++--
 testsuites/libtests/POSIX/README |  7 ++++---
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c
index c4c31c3..ff6e6ef 100644
--- a/cpukit/ftpd/ftpd.c
+++ b/cpukit/ftpd/ftpd.c
@@ -1,6 +1,6 @@
 /* FIXME: 1. Parse command is a hack.  We can do better.
  *        2. OSV: hooks support seems to be bad, as it requires storing of
- *           entire input file in memory.  Seem to be better to change it to
+ *           entire input file in memory.  Seems to be better to change it to
  *           something more reasonable, like having
  *           'hook_write(void const *buf, int count)' routine that will be
  *           called multiple times while file is being received.
@@ -34,7 +34,7 @@
  *
  *      * Bug in `close_data_socket()' introduced by previous change fixed.
  *      * `command_pasv()' changed to set timeout on socket we are listening on
- *        and code fixed to don't close socket twice on error.
+ *        and code fixed to not close socket twice on error.
  *      * `serr()' changed to clear `errno'.
  *      * `data_socket()' changed to clear `errno' before `bind()'.
  *      * `session()' changed to clear `errno' before processing session.
@@ -67,7 +67,7 @@
  *      * Command parsing a little bit improved: command names are now
  *        converted to upper-case to be more compatible with RFC (command
  *        names are not case-sensitive.)
- *      * Reformat comments so that they have RTEMS look-and-feel.
+ *      * Reformat comments so that they have RTEMS look and feel.
  *
  *    2001-01-16        Sergei Organov <osv at javad.ru>
  *
@@ -227,7 +227,7 @@
 
 #define FTPD_SYSTYPE "UNIX Type: L8"
 
-/* Seem to be unused */
+/* Seems to be unused */
 #if 0
 #define FTPD_WELCOME_MESSAGE \
    "Welcome to the RTEMS FTP server.\n" \
@@ -309,7 +309,7 @@ static void
 yield(void)
 {
 /*
- * If we build not for the legacy network stack, then we use the libbsd.  In
+ * If we do not build for the legacy network stack, then we use the libbsd.  In
  * the libbsd there is no global network stack semaphore which provides round
  * robin fairness for threads of equal priority.
  */
@@ -1475,8 +1475,8 @@ command_port(FTPD_SessionInfo_t *info, char const *args)
 
     if(i == NUM_FIELDS)
     {
-      /* Note: while it contradicts with RFC959, we don't allow PORT command
-       * to specify IP address different than those of the originating client
+      /* Note: while it contradicts RFC959, we don't allow PORT command
+       * to specify IP address different from that of the originating client
        * for the sake of safety. */
       if (ip_info.u.ip == info->def_addr.sin_addr.s_addr)
       {
@@ -1855,7 +1855,7 @@ exec_command(FTPD_SessionInfo_t *info, char *cmd, char *args)
 /*
  * session
  *
- * This task handles single session.  It is waked up when the FTP daemon gets a
+ * This task handles single session.  It is woken up when the FTP daemon gets a
  * service request from a remote machine.  Here, we watch for commands that
  * will come through the control connection.  These commands are then parsed
  * and executed until the connection is closed, either unintentionally or
@@ -1915,7 +1915,7 @@ session(rtems_task_argument arg)
           send_reply(info, 501, "Command line too long.");
 
           /*
-           * We could also try to continue here, however, discarding the rest
+           * We could also try to continue here; however, discarding the rest
            * of the current command line and figuring out when the next command
            * starts with fgets() is not that easy.  It would be better to avoid
            * the FILE stream and just use the socket directly with send() and
diff --git a/cpukit/libdrvmgr/README b/cpukit/libdrvmgr/README
index 0f7dde6..d0ef233 100644
--- a/cpukit/libdrvmgr/README
+++ b/cpukit/libdrvmgr/README
@@ -7,7 +7,7 @@ http://www.gaisler.com/anonftp/rcc/doc/.
 
 INITIALIZATION
 ==============
-The Driver Manager can be intialized in two different ways:
+The Driver Manager can be initialized in two different ways:
  1. during RTEMS startup
  2. started by user, typically in the Init task
 
@@ -33,11 +33,11 @@ Most of the problems above are solved for the two methods by
 specifying in which initialization levels IRQ handling is done.
 See Level 1 and Level 2 below.
 
-Other differences is that IRQ, System Clock Timer, debug Console
-and Console can be initialized by the help of the driver manager
+Other differences are that IRQ, System Clock Timer, debug Console
+and Console can be initialized with the help of the driver manager
 when initialized during start up. Between Level0 and Level1 the
-RTEMS I/O Manager drivers are initialized. The LEON3 BSP has
-therefore two different versions of the basic drivers.
+RTEMS I/O Manager drivers are initialized. The LEON3 BSP therefore
+has two different versions of the basic drivers.
 
 
 LEVEL0
@@ -48,7 +48,7 @@ driver.
 
 LEVEL1 - FIND/RESET/IRQ Clear
 -----------------------------
-The driver is for the first time informed of the presence of a
+The driver is, for the first time, informed of the presence of a
 device. Only basic initialization.
 
 - Find all hardware needed for IRQ, Console, Timer and hardware
@@ -65,14 +65,14 @@ device. Only basic initialization.
 - Register Timer for system clock
 - Register Console UART
 
-During this intialization level interrupts may not be registered, 
-enabled or disabled at the IRQ controller. But, all IRQ sources
+During this initialization level interrupts may not be registered, 
+enabled or disabled at the IRQ controller, but all IRQ sources
 should be cleared to avoid spurious interrupts later on.
 
 
 AFTER LEVEL1 - if initialized during startup
 --------------------------------------------
-The statically configured drivers are initialized as normally by RTEMS. The
+The statically configured drivers are initialized as normal by RTEMS. The
 hardware was found in LEVEL1.
 
 CONFIGURE_BSP_PREREQUISITE_DRIVERS may initialize IRQ driver, or 
diff --git a/make/leaf.cfg b/make/leaf.cfg
index 6ebf4bd..7ce50ef 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -17,7 +17,7 @@ LIBSUFFIX_VA = $(LIB_VARIANT).a
 
 # Pull in the desired "target" compiler
 # Programs built on the host use automake generated rules.
-# This will not change $(ARCH) -- binaries will still be place as per target
+# This will not change $(ARCH) -- binaries will still be placed as per target
 include ${CONFIG.CC}
 ifeq (${DEPEND},$(wildcard ${DEPEND}))
 include ${DEPEND}		     # pull in dependencies if they exist
@@ -32,7 +32,7 @@ debug:
 endif
 
 #
-# VARIANT_VA will convert our ${ARCH} back into "" or "debug".
+# VARIANT_VA will convert our ${ARCH} back to "" or "debug".
 #   Handy when one makefile wants to hop over into a peer's tree and
 #   build something "the same" way.
 #
diff --git a/testsuites/libtests/POSIX/README b/testsuites/libtests/POSIX/README
index 48dfa81..8ba8622 100644
--- a/testsuites/libtests/POSIX/README
+++ b/testsuites/libtests/POSIX/README
@@ -1,4 +1,4 @@
-This testsuite consists of a collection of (non-functional) programs snippets 
+This testsuite consists of a collection of (non-functional) program snippets 
 to check an RTEMS toolchain consisting of 
 * GCC (libgcc etc.)
 * binutils
@@ -7,7 +7,7 @@ to check an RTEMS toolchain consisting of
 for IEEE Std 1003.1-2008 (aka. POSIX[1]) compliance by link-tests.
 
 All of these programs are supposed to be compilable without any warning,
-independently of the configuration being used in any of the components
+independently of the configuration used in any of the components
 involved.
 
 NB: 
@@ -17,9 +17,10 @@ NB:
 - These program snippets are not supposed to be functional.
 
 - This suite only checks for a subset of POSIX library calls, which are
-  known to have been critical in RTEMS/GCC/newlib interaction at some point
+  known to have been critical to RTEMS/GCC/newlib interaction at some point
   in RTEMS/GCC/newlib's history.
 
 References:
 [1] The Open Group Base Specifications Issue 7, IEEE Std 1003.1â„¢-2008,
     http://www.opengroup.org/onlinepubs/9699919799
+



More information about the vc mailing list