You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/03/18 17:11:56 UTC
[incubator-nuttx-apps] branch master updated (e1d9e82 -> 80428f5)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from e1d9e82 nshlib: Fix a few strange whitespace in command help text
new f17d89d examples/slcd: fix priv->fd that was used by slcd_flush before being set
new 80428f5 examples/slcd/slcd_main.c: Fix nxstyle issues.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/slcd/slcd_main.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
[incubator-nuttx-apps] 02/02: examples/slcd/slcd_main.c: Fix
nxstyle issues.
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 80428f56e2cb82090625550bbfd3876e277e7c95
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Wed Mar 18 11:03:30 2020 -0600
examples/slcd/slcd_main.c: Fix nxstyle issues.
---
examples/slcd/slcd_main.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/examples/slcd/slcd_main.c b/examples/slcd/slcd_main.c
index ff1153a..4d2c778 100644
--- a/examples/slcd/slcd_main.c
+++ b/examples/slcd/slcd_main.c
@@ -61,6 +61,7 @@
/****************************************************************************
* Private Typs
****************************************************************************/
+
/* All state information for this test is kept within the following structure
* in order create a namespace and to minimize the possibility of name
* collisions.
@@ -101,7 +102,8 @@ static const char g_slcdhello[] = "Hello";
*
****************************************************************************/
-void slcd_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, unsigned int buflen)
+void slcd_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
+ unsigned int buflen)
{
int i;
int j;
@@ -154,7 +156,7 @@ void slcd_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, unsigned in
}
printf("\n");
- }
+ }
}
/****************************************************************************
@@ -359,8 +361,9 @@ int main(int argc, FAR char *argv[])
return 0;
errout_with_fd:
- close(priv->fd);
+ close(priv->fd);
+
errout:
- priv->initialized = false;
- exit(EXIT_FAILURE);
+ priv->initialized = false;
+ exit(EXIT_FAILURE);
}
[incubator-nuttx-apps] 01/02: examples/slcd: fix priv->fd that was
used by slcd_flush before being set
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit f17d89d0851cb55bf51bf66d86792e2b67bb2cfa
Author: Pierre-Olivier Vauboin <po...@lambdaconcept.com>
AuthorDate: Wed Mar 18 14:56:27 2020 +0100
examples/slcd: fix priv->fd that was used by slcd_flush before being set
---
examples/slcd/slcd_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/examples/slcd/slcd_main.c b/examples/slcd/slcd_main.c
index 3103c4a..ff1153a 100644
--- a/examples/slcd/slcd_main.c
+++ b/examples/slcd/slcd_main.c
@@ -267,7 +267,7 @@ int main(int argc, FAR char *argv[])
printf("Opening %s for read/write access\n", CONFIG_EXAMPLES_SLCD_DEVNAME);
fd = open(CONFIG_EXAMPLES_SLCD_DEVNAME, O_RDWR);
- if (priv->fd < 0)
+ if (fd < 0)
{
printf("Failed to open %s: %d\n", CONFIG_EXAMPLES_SLCD_DEVNAME, errno);
goto errout;
@@ -286,6 +286,7 @@ int main(int argc, FAR char *argv[])
#ifdef CONFIG_STDIO_LINEBUFFER
priv->stream.flush = slcd_flush;
#endif
+ priv->fd = fd;
/* Get the attributes of the SCLD device */