Remove CONFIG_LIBC_PERROR_DEVNAME. What was I thinking?

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5074 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-09-01 00:26:37 +00:00
parent c28bda212a
commit 092d15a74a
5 changed files with 14 additions and 41 deletions
+2
View File
@@ -3241,3 +3241,5 @@
files for the STM3240G-EVAL were replaced by one version in this directory. files for the STM3240G-EVAL were replaced by one version in this directory.
* configs/stm3240g-eval/webserver: Configuration submitted by Max Holtzberg * configs/stm3240g-eval/webserver: Configuration submitted by Max Holtzberg
for testing the changes to the uIP web server (see apps/ChangeLog.txt). for testing the changes to the uIP web server (see apps/ChangeLog.txt).
* lib/stdio/lib_perror.c: Remove CONFIG_LIBC_PERROR_DEVNAME. What was I
thinking? Arbitrary streams cannot be shared by different tasks.
-5
View File
@@ -4378,11 +4378,6 @@ build
POSIX requires that <code>perror()</code> provide its output on <code>stderr</code>. POSIX requires that <code>perror()</code> provide its output on <code>stderr</code>.
This option may be defined, however, to provide <code>perror()</code> output that is serialized with other <code>stdout</code> messages. This option may be defined, however, to provide <code>perror()</code> output that is serialized with other <code>stdout</code> messages.
</li> </li>
<li>
<code>CONFIG_LIBC_PERROR_DEVNAME</code>:
Another non-standard option is to provide <code>perror()</code> output to a logging device or file.
<code>CONFIG_LIBC_PERROR_DEVNAME<code> may be defined to be any write-able, character device (or file).
</li>
</ul> </ul>
<h2>Allow for architecture optimized implementations</h2> <h2>Allow for architecture optimized implementations</h2>
-3
View File
@@ -573,9 +573,6 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_LIBC_PERROR_STDOUT - POSIX requires that perror() provide its output CONFIG_LIBC_PERROR_STDOUT - POSIX requires that perror() provide its output
on stderr. This option may be defined, however, to provide perror() output on stderr. This option may be defined, however, to provide perror() output
that is serialized with other stdout messages. that is serialized with other stdout messages.
CONFIG_LIBC_PERROR_DEVNAME - Another non-standard option is to provide
perror() output to a logging device or file. CONFIG_LIBC_PERROR_DEVNAME
may be defined to be any write-able, character device (or file).
Allow for architecture optimized implementations Allow for architecture optimized implementations
+2 -33
View File
@@ -53,18 +53,8 @@
#ifdef CONFIG_LIBC_PERROR_STDOUT #ifdef CONFIG_LIBC_PERROR_STDOUT
# define PERROR_STREAM stdout # define PERROR_STREAM stdout
# undef CONFIG_LIBC_PERROR_DEVNAME
#endif
/* Another non-standard option is to provide perror output to a logging
* device or file. CONFIG_LIBC_PERROR_DEVNAME may be defined to be any write-
* able, character device (or file).
*/
#ifndef CONFIG_LIBC_PERROR_DEVNAME
# define PERROR_STREAM stderr
#else #else
# define PERROR_STREAM perror_stream; # define PERROR_STREAM stderr
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -83,10 +73,6 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_LIBC_PERROR_DEVNAME
static FILE *perror_stream;
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@@ -101,24 +87,6 @@ static FILE *perror_stream;
void perror(FAR const char *s) void perror(FAR const char *s)
{ {
/* If we are using a custom output device (something other than
* /dev/console), then make sure that the device has been opened.
*/
#ifdef CONFIG_LIBC_PERROR_DEVNAME
if (!perror_stream)
{
/* Not yet.. open it now */
perror_stream = fopen(CONFIG_LIBC_PERROR_DEVNAME, "w");
if (!perror_stream)
{
/* Oops... we couldn't open the device */
return;
}
}
#endif
/* If strerror() is not enabled, then just print the error number */ /* If strerror() is not enabled, then just print the error number */
@@ -128,3 +96,4 @@ void perror(FAR const char *s)
(void)fprintf(PERROR_STREAM, "%s: Error %d\n", s, errno); (void)fprintf(PERROR_STREAM, "%s: Error %d\n", s, errno);
#endif #endif
} }
+10
View File
@@ -44,6 +44,16 @@ mkexport.sh and Makefile.export
Makefile.export is used only by the mkexport.sh script to parse out Makefile.export is used only by the mkexport.sh script to parse out
options from the top-level Make.defs file. options from the top-level Make.defs file.
mkfsdata.pl
This perl script is used to build the "fake" file system and CGI support
as needed for the apps/netutils/webserver. It is currently used only
by the Makefile at apps/examples/uip. That example serves as an example
of how to configure the uIP webserver "fake" file system.
NOTE: This perl script comes from uIP and was (probably) written
by Adam Dunkels. uIP has a license that is compatible with NuttX.
mkversion.c, cfgparser.c, and cfgparser.h mkversion.c, cfgparser.c, and cfgparser.h
This is C file that is used to build mkversion program. The mkversion This is C file that is used to build mkversion program. The mkversion