RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-10-15 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
PR 1303/bsps
	* fatal/bspfatal.c: strcat() is safe to use even in worst case, so do
	not have BSP specific mystrcat().
This commit is contained in:
Joel Sherrill
2008-10-15 17:50:00 +00:00
parent 1fae7b43d7
commit b4288f054d
2 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/m68k/mvme167/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-10-15 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1303/bsps
* fatal/bspfatal.c: strcat() is safe to use even in worst case, so do
not have BSP specific mystrcat().
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> 2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect * Makefile.am: Eliminate bsp.am. Build startup files as side-effect

42
c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
View File

@@ -13,33 +13,7 @@
#include <bsp.h> #include <bsp.h>
#include <fatal.h> #include <fatal.h>
#include <string.h>
/*
* mystrcat
*
* Can't rely on libc being operational. So we provide our own strcat-like
* function.
*
* Input parameters:
* destination - string (buffer) to append to
* source - string to append to the end of destination
*
* Output parameters:
* destination - source is appended to the end
*
* Return values:
* Number of characters appended.
*/
static int mystrcat(
char *destination,
const char *source
)
{
int i;
for ( i = 0; ( *destination++ = *source++) != '\0'; i++ );
return i;
}
/* /*
* bsp_fatal_error_occurred * bsp_fatal_error_occurred
@@ -73,42 +47,42 @@ User_extensions_routine bsp_fatal_error_occurred(
} my_p_str; } my_p_str;
my_p_str.index = 0; my_p_str.index = 0;
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"\r\nRTEMS Fatal Error Occurred:\r\n the_source = " ); "\r\nRTEMS Fatal Error Occurred:\r\n the_source = " );
switch ( the_source ) { switch ( the_source ) {
case INTERNAL_ERROR_CORE: case INTERNAL_ERROR_CORE:
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"INTERNAL_ERROR_CORE\r\n is_internal = " ); "INTERNAL_ERROR_CORE\r\n is_internal = " );
break; break;
case INTERNAL_ERROR_RTEMS_API: case INTERNAL_ERROR_RTEMS_API:
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"INTERNAL_ERROR_RTEMS_API\r\n is_internal = " ); "INTERNAL_ERROR_RTEMS_API\r\n is_internal = " );
break; break;
case INTERNAL_ERROR_POSIX_API: case INTERNAL_ERROR_POSIX_API:
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"INTERNAL_ERROR_POSIX_API\r\n is_internal = " ); "INTERNAL_ERROR_POSIX_API\r\n is_internal = " );
break; break;
default: default:
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"UNKNOWN\r\n is_internal = " ); "UNKNOWN\r\n is_internal = " );
break; break;
} }
if ( is_internal ) if ( is_internal )
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"TRUE\r\n the_error = 0x|10,8|\r\n" ); "TRUE\r\n the_error = 0x|10,8|\r\n" );
else else
my_p_str.index += mystrcat( my_p_str.index += strcat(
my_p_str.strbuf + my_p_str.index, my_p_str.strbuf + my_p_str.index,
"FALSE\r\n the_error = 0x|10,8|\r\n" ); "FALSE\r\n the_error = 0x|10,8|\r\n" );