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

2004-03-05 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* libblock/src/bdbuf.c, libblock/src/ramdisk.c,
	libcsupport/src/newlibc.c, libcsupport/src/sync.c,
	libmisc/cpuuse/cpuuse.c, libmisc/monitor/mon-symbols.c,
	libmisc/shell/cmds.c, libmisc/shell/shell.c,
	libnetworking/kern/kern_sysctl.c, libnetworking/lib/ftpfs.c,
	libnetworking/lib/tftpDriver.c, libnetworking/libc/gethostbydns.c,
	libnetworking/libc/gethostbyht.c, libnetworking/libc/gethostnamadr.c,
	libnetworking/libc/getnetbyht.c, libnetworking/libc/getnetnamadr.c,
	libnetworking/libc/inet_addr.c, libnetworking/libc/linkaddr.c,
	libnetworking/libc/map_v4v6.c, libnetworking/libc/ns_print.c,
	libnetworking/libc/ns_ttl.c, libnetworking/libc/nsap_addr.c,
	libnetworking/libc/rcmd.c, libnetworking/libc/res_debug.c,
	libnetworking/libc/res_mkupdate.c, libnetworking/libc/res_query.c,
	libnetworking/libc/res_send.c, libnetworking/libc/res_update.c,
	libnetworking/net/radix.c, libnetworking/rtems/mkrootfs.c,
	librpc/src/rpc/clnt_perror.c, librpc/src/rpc/svc.c,
	score/macros/rtems/score/chain.inl, score/src/objectidtoname.c: Too
	much was accidentally committed -- revert.
This commit is contained in:
Joel Sherrill
2004-03-05 18:02:41 +00:00
parent b2b143f402
commit cb2f32039d
35 changed files with 52 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cpukit/ChangeLog
View File

@@ -1,3 +1,24 @@
2004-03-05 Joel Sherrill <joel@OARcorp.com>
* libblock/src/bdbuf.c, libblock/src/ramdisk.c,
libcsupport/src/newlibc.c, libcsupport/src/sync.c,
libmisc/cpuuse/cpuuse.c, libmisc/monitor/mon-symbols.c,
libmisc/shell/cmds.c, libmisc/shell/shell.c,
libnetworking/kern/kern_sysctl.c, libnetworking/lib/ftpfs.c,
libnetworking/lib/tftpDriver.c, libnetworking/libc/gethostbydns.c,
libnetworking/libc/gethostbyht.c, libnetworking/libc/gethostnamadr.c,
libnetworking/libc/getnetbyht.c, libnetworking/libc/getnetnamadr.c,
libnetworking/libc/inet_addr.c, libnetworking/libc/linkaddr.c,
libnetworking/libc/map_v4v6.c, libnetworking/libc/ns_print.c,
libnetworking/libc/ns_ttl.c, libnetworking/libc/nsap_addr.c,
libnetworking/libc/rcmd.c, libnetworking/libc/res_debug.c,
libnetworking/libc/res_mkupdate.c, libnetworking/libc/res_query.c,
libnetworking/libc/res_send.c, libnetworking/libc/res_update.c,
libnetworking/net/radix.c, libnetworking/rtems/mkrootfs.c,
librpc/src/rpc/clnt_perror.c, librpc/src/rpc/svc.c,
score/macros/rtems/score/chain.inl, score/src/objectidtoname.c: Too
much was accidentally committed -- revert.
2004-03-05 Joel Sherrill <joel@OARcorp.com>
* libblock/src/bdbuf.c, libblock/src/ramdisk.c,

3
cpukit/libblock/src/bdbuf.c
View File

@@ -228,8 +228,7 @@ avl_insert(bdbuf_buffer **root, bdbuf_buffer *node)
blkdev_bnum block = node->block;
bdbuf_buffer *p = *root;
bdbuf_buffer *q = NULL;
bdbuf_buffer *p1, *p2;
bdbuf_buffer *q, *p1, *p2;
bdbuf_buffer *buf_stack[AVL_MAX_HEIGHT];
bdbuf_buffer **buf_prev = buf_stack;

6
cpukit/libblock/src/ramdisk.c
View File

@@ -12,12 +12,6 @@
#include <rtems.h>
#include <rtems/libio.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>

41
cpukit/libcsupport/src/newlibc.c
View File

@@ -22,12 +22,6 @@
#if defined(RTEMS_NEWLIB)
#include <rtems/libcsupport.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdlib.h> /* for free() */
#include <string.h> /* for memset() */
@@ -132,25 +126,25 @@ rtems_boolean libc_create_hook(
{
#ifdef __GNUC__
/* GCC extension: structure constants */
_REENT_INIT_PTR((ptr));
/* GCC extension: structure constants */
_REENT_INIT_PTR((ptr));
#else
/*
* WARNING: THIS IS VERY DEPENDENT ON NEWLIB!!!
* Last visual check was against newlib 1.8.2 but last known
* use was against 1.7.0. This is basically an exansion of
* REENT_INIT() in <sys/reent.h>.
*/
memset(ptr, 0, sizeof(*ptr));
ptr->_stdin = &ptr->__sf[0];
ptr->_stdout = &ptr->__sf[1];
ptr->_stderr = &ptr->__sf[2];
ptr->_current_locale = "C";
ptr->_new._reent._rand_next = 1;
/*
* WARNING: THIS IS VERY DEPENDENT ON NEWLIB!!!
* Last visual check was against newlib 1.8.2 but last known
* use was against 1.7.0. This is basically an exansion of
* REENT_INIT() in <sys/reent.h>.
*/
memset(ptr, 0, sizeof(*ptr));
ptr->_stdin = &ptr->__sf[0];
ptr->_stdout = &ptr->__sf[1];
ptr->_stderr = &ptr->__sf[2];
ptr->_current_locale = "C";
ptr->_new._reent._rand_next = 1;
#endif
creating_task->libc_reent = ptr;
return TRUE;
creating_task->libc_reent = ptr;
return TRUE;
}
else
return FALSE;
@@ -241,6 +235,7 @@ rtems_extension libc_delete_hook(
ptr = deleted_task->libc_reent;
}
/* if (ptr) */
if (ptr && ptr != &libc_global_reent) {
/*
_wrapup_reent(ptr);
@@ -253,7 +248,7 @@ rtems_extension libc_delete_hook(
#if REENT_MALLOCED
free(ptr);
#else
_Workspace_Free(ptr);
_Workspace_Free(ptr);
#endif
}

24
cpukit/libcsupport/src/sync.c
View File

@@ -21,13 +21,6 @@
#include "config.h"
#endif
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
int fdatasync(int); /* still not always prototyped */
#include <unistd.h>
#include <stdio.h>
@@ -42,7 +35,6 @@ int fdatasync(int); /* still not always prototyped */
/* XXX check standards -- Linux version appears to be void */
void _fwalk(struct _reent *, void *);
static void sync_wrapper(FILE *f)
{
int fn = fileno(f);
@@ -68,22 +60,6 @@ static void sync_per_thread(Thread_Control *t)
int sync(void)
{
extern struct _reent libc_global_reent;
/*
* Walk the one used initially by RTEMS.
*/
_fwalk(&libc_global_reent, sync_wrapper);
/*
* XXX Do we walk the one used globally by newlib?
* XXX Do we need the RTEMS global one?
*/
/*
* Now walk all the per-thread reentrancy structures.
*/
rtems_iterate_over_all_threads(sync_per_thread);
return 0;
}

3
cpukit/libmisc/cpuuse/cpuuse.c
View File

@@ -101,8 +101,7 @@ void CPU_usage_Dump( void )
if ( !isprint(name[2]) ) name[2] = '*';
if ( !isprint(name[3]) ) name[3] = '*';
#if defined(unix) || \
( (CPU_HARDWARE_FP == TRUE) && !defined(__mips_single_float) )
#if defined(unix) || ( CPU_HARDWARE_FP == TRUE )
printf( "0x%08x %4s %8d %5.3f\n",
the_thread->Object.id,
name,

10
cpukit/libmisc/monitor/mon-symbols.c
View File

@@ -15,17 +15,13 @@
#include "config.h"
#endif
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <rtems.h>
#include <stdio.h>
#include <stdlib.h>
#include <rtems/monitor.h>
#include "symbols.h"

7
cpukit/libmisc/shell/cmds.c
View File

@@ -27,11 +27,6 @@
#include "config.h"
#endif
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h>
#include <termios.h>
#include <string.h>
@@ -452,7 +447,7 @@ int main_umask(int argc,char *argv[])
if (argc == 2) msk=str2int(argv[1]);
umask(msk);
msk=umask(0);
printf("0%o\n", (unsigned int) msk);
printf("0%o\n",msk);
umask(msk);
return 0;
}

5
cpukit/libmisc/shell/shell.c
View File

@@ -16,11 +16,6 @@
#include "config.h"
#endif
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h>
#include <time.h>

5
cpukit/libnetworking/kern/kern_sysctl.c
View File

@@ -60,11 +60,6 @@
#else
#include <sys/buf.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h> /* for snprintf() */
size_t strlcpy(char *, const char *, size_t);
#endif

4
cpukit/libnetworking/lib/ftpfs.c
View File

@@ -636,8 +636,8 @@ int rtems_ftp_open(
hent = gethostbyname(hostname);
if (hent != NULL) {
memcpy((char *)(&(fsp->farCtrlAddress.sin_addr)),
hent->h_addr,
bcopy(hent->h_addr,
(char *)(&(fsp->farCtrlAddress.sin_addr)),
sizeof(fsp->farCtrlAddress.sin_addr));
}
else {

5
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -15,11 +15,6 @@
*
*/
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>

5
cpukit/libnetworking/libc/gethostbydns.c
View File

@@ -66,11 +66,6 @@ static char rcsid[] = "$Id$";
#include <arpa/inet.h>
#include <arpa/nameser.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h>
#include <unistd.h>
#include <string.h>

5
cpukit/libnetworking/libc/gethostbyht.c
View File

@@ -56,11 +56,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>

5
cpukit/libnetworking/libc/gethostnamadr.c
View File

@@ -28,11 +28,6 @@ static char sccsid[] = "@(#)$Id$";
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>

5
cpukit/libnetworking/libc/getnetbyht.c
View File

@@ -47,11 +47,6 @@ static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixi
static chat rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>

5
cpukit/libnetworking/libc/getnetnamadr.c
View File

@@ -27,11 +27,6 @@
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>

5
cpukit/libnetworking/libc/inet_addr.c
View File

@@ -58,11 +58,6 @@ static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/param.h>
#include <netinet/in.h>
#include <arpa/inet.h>

5
cpukit/libnetworking/libc/linkaddr.c
View File

@@ -37,11 +37,6 @@
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if_dl.h>

5
cpukit/libnetworking/libc/map_v4v6.c
View File

@@ -65,11 +65,6 @@ static char rcsid[] = "$Id$";
#include <arpa/inet.h>
#include <arpa/nameser.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h>
#include <string.h>
#include <netdb.h>

5
cpukit/libnetworking/libc/ns_print.c
View File

@@ -30,11 +30,6 @@ static char rcsid[] = "$Id$";
#include <arpa/nameser.h>
#include <arpa/inet.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <assert.h>
#include <errno.h>
#include <resolv.h>

5
cpukit/libnetworking/libc/ns_ttl.c
View File

@@ -25,11 +25,6 @@ static char rcsid[] = "$Id$";
#include <arpa/nameser.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <ctype.h>
#include <errno.h>
#include <stdio.h>

5
cpukit/libnetworking/libc/nsap_addr.c
View File

@@ -19,11 +19,6 @@
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>

5
cpukit/libnetworking/libc/rcmd.c
View File

@@ -44,11 +44,6 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
#include <netinet/in.h>
#include <arpa/inet.h>
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <signal.h>
#include <fcntl.h>
#include <netdb.h>

5
cpukit/libnetworking/libc/res_debug.c
View File

@@ -98,11 +98,6 @@ static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>

5
cpukit/libnetworking/libc/res_mkupdate.c
View File

@@ -26,11 +26,6 @@ static char rcsid[] = "$Id$";
#endif /* not lint */
#endif /* not rtems */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/param.h>

5
cpukit/libnetworking/libc/res_query.c
View File

@@ -74,11 +74,6 @@ static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halle
static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>

5
cpukit/libnetworking/libc/res_send.c
View File

@@ -78,11 +78,6 @@ static char rcsid[] = "$Id$";
* Send query to name server and wait for reply.
*/
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>

5
cpukit/libnetworking/libc/res_update.c
View File

@@ -26,11 +26,6 @@ static char rcsid[] = "$Id$";
* <viraj_bais@ccm.fm.intel.com>
*/
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/time.h>

2
cpukit/libnetworking/net/radix.c
View File

@@ -1026,6 +1026,6 @@ rn_init()
addmask_key = cplim = rn_ones + max_keylen;
while (cp < cplim)
*cp++ = -1;
if (rn_inithead((void *)&mask_rnhead, 0) == 0)
if (rn_inithead((void **)&mask_rnhead, 0) == 0)
panic("rn_init 2");
}

5
cpukit/libnetworking/rtems/mkrootfs.c
View File

@@ -25,11 +25,6 @@
*/
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <errno.h>
#include <stdio.h>
#include <string.h>

5
cpukit/librpc/src/rpc/clnt_perror.c
View File

@@ -39,11 +39,6 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.11 1999/08/28
* Copyright (C) 1984, Sun Microsystems, Inc.
*
*/
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

5
cpukit/librpc/src/rpc/svc.c
View File

@@ -43,11 +43,6 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc.c,v 1.14 1999/08/28 00:00:4
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
/* Since we compile with strict ANSI we need to undef it to get
* prototypes for extensions
*/
#undef __STRICT_ANSI__
#include <string.h>
#include <stdlib.h>
#include <sys/errno.h>

4
cpukit/score/macros/rtems/score/chain.inl
View File

@@ -46,7 +46,7 @@
*/
#define _Chain_Head( _the_chain ) \
((Chain_Node *) ((void *)(_the_chain)))
((Chain_Node *) (_the_chain))
/*PAGE
*
@@ -54,7 +54,7 @@
*/
#define _Chain_Tail( _the_chain ) \
((Chain_Node *) ((void *)&(_the_chain)->permanent_null))
((Chain_Node *) &(_the_chain)->permanent_null)
/*PAGE
*

3
cpukit/score/src/objectidtoname.c
View File

@@ -40,7 +40,6 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
unsigned32 the_class;
Objects_Information *information;
Objects_Control *the_object = (Objects_Control *) 0;
Objects_Locations ignored_location;
if ( !name )
return OBJECTS_INVALID_NAME;
@@ -58,7 +57,7 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
if ( information->is_string )
return OBJECTS_INVALID_ID;
the_object = _Objects_Get( information, id, &ignored_location );
the_object = _Objects_Get( information, id, OBJECTS_SEARCH_LOCAL_NODE );
if (!the_object)
return OBJECTS_INVALID_ID;