sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/examples/pipes: Fix some kruft left in last commit; Also clean up some coding standard problems.

Browse Source
This commit is contained in:
Gregory Nutt 2017-11-29 15:27:20 -06:00
parent 1956f66ee6
commit 4a140f70d0
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
examples/pipe/redirect_test.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* examples/pipe/redirect_test.c * examples/pipe/redirect_test.c
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -54,10 +54,6 @@
#define READ_SIZE 37 #define READ_SIZE 37
/****************************************************************************
* Private Types
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
@ -92,7 +88,8 @@ static int redirect_reader(int argc, char *argv[])
ret = close(fdout); ret = close(fdout);
if (ret != 0) if (ret != 0)
{ {
fprintf(stderr, "redirect_reader: failed to close fdout=%d\n", fdout); fprintf(stderr, "redirect_reader: failed to close fdout=%d\n",
fdout);
return 1; return 1;
} }
@ -125,13 +122,15 @@ static int redirect_reader(int argc, char *argv[])
ret = read(0, buffer, READ_SIZE); ret = read(0, buffer, READ_SIZE);
if (ret < 0 ) if (ret < 0 )
{ {
fprintf(stderr, "redirect_reader: read failed, errno=%d\n", errno); fprintf(stderr, "redirect_reader: read failed, errno=%d\n",
errno);
return 4; return 4;
} }
else if (ret == 0) else if (ret == 0)
{ {
break; break;
} }
nbytes += ret; nbytes += ret;
/* Echo to stdout */ /* Echo to stdout */
@ -139,7 +138,8 @@ static int redirect_reader(int argc, char *argv[])
ret = write(1, buffer, ret); ret = write(1, buffer, ret);
if (ret < 0) if (ret < 0)
{ {
fprintf(stderr, "redirect_reader: read failed, errno=%d\n", errno); fprintf(stderr, "redirect_reader: read failed, errno=%d\n",
errno);
return 5; return 5;
} }
} }
@ -198,7 +198,8 @@ static int redirect_writer(int argc, char *argv[])
ret = close(fdout); ret = close(fdout);
if (ret != 0) if (ret != 0)
{ {
fprintf(stderr, "redirect_reader: failed to close fdout=%d\n", fdout); fprintf(stderr, "redirect_reader: failed to close fdout=%d\n",
fdout);
return 3; return 3;
} }
@ -280,7 +281,7 @@ int redirection_test(void)
if (readerid < 0) if (readerid < 0)
{ {
fprintf(stderr, fprintf(stderr,
"redirection_test: Failed to create redirect_writer task: %d\n",xi "redirection_test: Failed to create redirect_writer task: %d\n",
errno); errno);
return 1; return 1;
} }
@ -292,12 +293,18 @@ int redirection_test(void)
redirect_writer, (FAR char * const *)argv); redirect_writer, (FAR char * const *)argv);
if (writerid < 0) if (writerid < 0)
{ {
fprintf(stderr, "redirection_test: Failed to create redirect_writer task: %d\n", errno); fprintf(stderr,
"redirection_test: Failed to create redirect_writer task: %d\n",
errno);
ret = task_delete(readerid); ret = task_delete(readerid);
if (ret != 0) if (ret != 0)
{ {
fprintf(stderr, "redirection_test: Failed to delete redirect_reader task %d\n", errno); fprintf(stderr,
"redirection_test: Failed to delete redirect_reader task %d\n",
errno);
} }
return 2; return 2;
} }
@ -307,6 +314,7 @@ int redirection_test(void)
{ {
fprintf(stderr, "pipe_main: close failed: %d\n", errno); fprintf(stderr, "pipe_main: close failed: %d\n", errno);
} }
if (close(fd[1]) != 0) if (close(fd[1]) != 0)
{ {
fprintf(stderr, "pipe_main: close failed: %d\n", errno); fprintf(stderr, "pipe_main: close failed: %d\n", errno);
@ -327,4 +335,3 @@ int redirection_test(void)
printf("redirection_test: returning %d\n", ret); printf("redirection_test: returning %d\n", ret);
return ret; return ret;
} }