summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-30 17:43:44 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-30 17:43:44 -0600
commit7bbbe7e7b3159e2e021bae476099f40cf9cac3fb (patch)
tree44627342327e35a4fd7dc51afc4faf8bf844d75b
parent58f64ee43dbc72698ba12973b8681cc170cf0f20 (diff)
downloadpx4-nuttx-7bbbe7e7b3159e2e021bae476099f40cf9cac3fb.tar.gz
px4-nuttx-7bbbe7e7b3159e2e021bae476099f40cf9cac3fb.tar.bz2
px4-nuttx-7bbbe7e7b3159e2e021bae476099f40cf9cac3fb.zip
cosmetic update to comments
-rw-r--r--apps/include/readline.h11
-rw-r--r--apps/system/readline/std_readline.c8
-rw-r--r--nuttx/include/nuttx/analog/adc.h5
3 files changed, 12 insertions, 12 deletions
diff --git a/apps/include/readline.h b/apps/include/readline.h
index 463643534..a9c322b8c 100644
--- a/apps/include/readline.h
+++ b/apps/include/readline.h
@@ -98,11 +98,14 @@ ssize_t readline(FAR char *buf, int buflen, FILE *instream, FILE *outstream);
/****************************************************************************
* Name: std_readline
*
- * std_readline is requivalent to readline except that it uses only stdin
- * and stdout.
+ * readline() reads in at most one less than 'buflen' characters from
+ * 'stdin' and stores them into the buffer pointed to by 'buf'.
+ * Characters are echoed on 'stdout'. Reading stops after an EOF or a
+ * newline. If a newline is read, it is stored into the buffer. A null
+ * terminator is stored after the last character in the buffer.
*
* This version of realine assumes that we are reading and writing to
- * a VT100 console. This will not work well if 'instream' or 'outstream'
+ * a VT100 console. This will not work well if 'stdin' or 'stdout'
* corresponds to a raw byte steam.
*
* This function is inspired by the GNU readline but is an entirely
@@ -111,8 +114,6 @@ ssize_t readline(FAR char *buf, int buflen, FILE *instream, FILE *outstream);
* Input Parameters:
* buf - The user allocated buffer to be filled.
* buflen - the size of the buffer.
- * instream - The stream to read characters from
- * outstream - The stream to each characters to.
*
* Returned values:
* On success, the (positive) number of bytes transferred is returned.
diff --git a/apps/system/readline/std_readline.c b/apps/system/readline/std_readline.c
index 8778f1677..5f44fcf43 100644
--- a/apps/system/readline/std_readline.c
+++ b/apps/system/readline/std_readline.c
@@ -126,13 +126,13 @@ static void readline_write(FAR struct rl_common_s *vtbl,
* Name: std_readline
*
* readline() reads in at most one less than 'buflen' characters from
- * 'instream' and stores them into the buffer pointed to by 'buf'.
- * Characters are echoed on 'outstream'. Reading stops after an EOF or a
+ * 'stdin' and stores them into the buffer pointed to by 'buf'.
+ * Characters are echoed on 'stdout'. Reading stops after an EOF or a
* newline. If a newline is read, it is stored into the buffer. A null
* terminator is stored after the last character in the buffer.
*
* This version of realine assumes that we are reading and writing to
- * a VT100 console. This will not work well if 'instream' or 'outstream'
+ * a VT100 console. This will not work well if 'stdin' or 'stdout'
* corresponds to a raw byte steam.
*
* This function is inspired by the GNU readline but is an entirely
@@ -141,8 +141,6 @@ static void readline_write(FAR struct rl_common_s *vtbl,
* Input Parameters:
* buf - The user allocated buffer to be filled.
* buflen - the size of the buffer.
- * instream - The stream to read characters from
- * outstream - The stream to each characters to.
*
* Returned values:
* On success, the (positive) number of bytes transferred is returned.
diff --git a/nuttx/include/nuttx/analog/adc.h b/nuttx/include/nuttx/analog/adc.h
index 9970f4723..ac38d6820 100644
--- a/nuttx/include/nuttx/analog/adc.h
+++ b/nuttx/include/nuttx/analog/adc.h
@@ -7,6 +7,7 @@
* 0.2 remove ao_read
*
* Derived from include/nuttx/can.h
+ *
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
@@ -125,7 +126,6 @@ struct adc_ops_s
/* All ioctl calls will be routed through this method */
CODE int (*ao_ioctl)(FAR struct adc_dev_s *dev, int cmd, unsigned long arg);
-
};
/* This is the device structure used by the driver. The caller of
@@ -157,7 +157,8 @@ struct adc_dev_s
************************************************************************************/
#if defined(__cplusplus)
-extern "C" {
+extern "C"
+{
#endif
/************************************************************************************