From cb2f32039d7cf5cceb7a1e50930bdcd95fa5fef7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 5 Mar 2004 18:02:41 +0000 Subject: 2004-03-05 Joel Sherrill * 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. --- cpukit/ChangeLog | 21 +++++++++++++++ cpukit/libblock/src/bdbuf.c | 3 +-- cpukit/libblock/src/ramdisk.c | 6 ----- cpukit/libcsupport/src/newlibc.c | 43 ++++++++++++++----------------- cpukit/libcsupport/src/sync.c | 24 ----------------- cpukit/libmisc/cpuuse/cpuuse.c | 3 +-- cpukit/libmisc/monitor/mon-symbols.c | 10 +++---- cpukit/libmisc/shell/cmds.c | 7 +---- cpukit/libmisc/shell/shell.c | 5 ---- cpukit/libnetworking/kern/kern_sysctl.c | 5 ---- cpukit/libnetworking/lib/ftpfs.c | 4 +-- cpukit/libnetworking/lib/tftpDriver.c | 5 ---- cpukit/libnetworking/libc/gethostbydns.c | 5 ---- cpukit/libnetworking/libc/gethostbyht.c | 5 ---- cpukit/libnetworking/libc/gethostnamadr.c | 5 ---- cpukit/libnetworking/libc/getnetbyht.c | 5 ---- cpukit/libnetworking/libc/getnetnamadr.c | 5 ---- cpukit/libnetworking/libc/inet_addr.c | 5 ---- cpukit/libnetworking/libc/linkaddr.c | 5 ---- cpukit/libnetworking/libc/map_v4v6.c | 5 ---- cpukit/libnetworking/libc/ns_print.c | 5 ---- cpukit/libnetworking/libc/ns_ttl.c | 5 ---- cpukit/libnetworking/libc/nsap_addr.c | 5 ---- cpukit/libnetworking/libc/rcmd.c | 5 ---- cpukit/libnetworking/libc/res_debug.c | 5 ---- cpukit/libnetworking/libc/res_mkupdate.c | 5 ---- cpukit/libnetworking/libc/res_query.c | 5 ---- cpukit/libnetworking/libc/res_send.c | 5 ---- cpukit/libnetworking/libc/res_update.c | 5 ---- cpukit/libnetworking/net/radix.c | 2 +- cpukit/libnetworking/rtems/mkrootfs.c | 5 ---- cpukit/librpc/src/rpc/clnt_perror.c | 5 ---- cpukit/librpc/src/rpc/svc.c | 5 ---- cpukit/score/macros/rtems/score/chain.inl | 4 +-- cpukit/score/src/objectidtoname.c | 3 +-- 35 files changed, 52 insertions(+), 193 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index d0fe28fd7e..f59d0a3e4d 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,24 @@ +2004-03-05 Joel Sherrill + + * 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 * libblock/src/bdbuf.c, libblock/src/ramdisk.c, diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c index 1991269385..739942e628 100644 --- a/cpukit/libblock/src/bdbuf.c +++ b/cpukit/libblock/src/bdbuf.c @@ -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; diff --git a/cpukit/libblock/src/ramdisk.c b/cpukit/libblock/src/ramdisk.c index a933dafec2..be78a8ee31 100644 --- a/cpukit/libblock/src/ramdisk.c +++ b/cpukit/libblock/src/ramdisk.c @@ -12,12 +12,6 @@ #include #include - -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c index b9ba3f8355..dcd7dae3b2 100644 --- a/cpukit/libcsupport/src/newlibc.c +++ b/cpukit/libcsupport/src/newlibc.c @@ -22,12 +22,6 @@ #if defined(RTEMS_NEWLIB) #include - -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include /* for free() */ #include /* for memset() */ @@ -132,26 +126,26 @@ 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 . - */ - 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 . + */ + 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 } diff --git a/cpukit/libcsupport/src/sync.c b/cpukit/libcsupport/src/sync.c index 8d1f52e725..4d317ce0b1 100644 --- a/cpukit/libcsupport/src/sync.c +++ b/cpukit/libcsupport/src/sync.c @@ -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 #include @@ -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; } diff --git a/cpukit/libmisc/cpuuse/cpuuse.c b/cpukit/libmisc/cpuuse/cpuuse.c index dc5d5481db..bf4f674fce 100644 --- a/cpukit/libmisc/cpuuse/cpuuse.c +++ b/cpukit/libmisc/cpuuse/cpuuse.c @@ -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, diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c index dd3dd58021..ab953d8628 100644 --- a/cpukit/libmisc/monitor/mon-symbols.c +++ b/cpukit/libmisc/monitor/mon-symbols.c @@ -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 -#include -#include #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ #include +#include +#include + #include #include "symbols.h" diff --git a/cpukit/libmisc/shell/cmds.c b/cpukit/libmisc/shell/cmds.c index 2461cc4901..2c462007df 100644 --- a/cpukit/libmisc/shell/cmds.c +++ b/cpukit/libmisc/shell/cmds.c @@ -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 #include #include @@ -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; } diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c index 0daea3e2e3..4a31186700 100644 --- a/cpukit/libmisc/shell/shell.c +++ b/cpukit/libmisc/shell/shell.c @@ -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 #include diff --git a/cpukit/libnetworking/kern/kern_sysctl.c b/cpukit/libnetworking/kern/kern_sysctl.c index 0809957797..c2bbb4aedd 100644 --- a/cpukit/libnetworking/kern/kern_sysctl.c +++ b/cpukit/libnetworking/kern/kern_sysctl.c @@ -60,11 +60,6 @@ #else #include -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include /* for snprintf() */ size_t strlcpy(char *, const char *, size_t); #endif diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c index 8a6769f2de..28ec9422ae 100644 --- a/cpukit/libnetworking/lib/ftpfs.c +++ b/cpukit/libnetworking/lib/ftpfs.c @@ -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 { diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c index 3b34dbabc8..6ab6c44659 100644 --- a/cpukit/libnetworking/lib/tftpDriver.c +++ b/cpukit/libnetworking/lib/tftpDriver.c @@ -15,11 +15,6 @@ * */ -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/libc/gethostbydns.c b/cpukit/libnetworking/libc/gethostbydns.c index f87b15489d..4991ccad22 100644 --- a/cpukit/libnetworking/libc/gethostbydns.c +++ b/cpukit/libnetworking/libc/gethostbydns.c @@ -66,11 +66,6 @@ static char rcsid[] = "$Id$"; #include #include -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/libc/gethostbyht.c b/cpukit/libnetworking/libc/gethostbyht.c index 023347f84e..29f2805367 100644 --- a/cpukit/libnetworking/libc/gethostbyht.c +++ b/cpukit/libnetworking/libc/gethostbyht.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/gethostnamadr.c b/cpukit/libnetworking/libc/gethostnamadr.c index e537c16499..92f7a21014 100644 --- a/cpukit/libnetworking/libc/gethostnamadr.c +++ b/cpukit/libnetworking/libc/gethostnamadr.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/getnetbyht.c b/cpukit/libnetworking/libc/getnetbyht.c index 95a8d796fe..f7b7b1091d 100644 --- a/cpukit/libnetworking/libc/getnetbyht.c +++ b/cpukit/libnetworking/libc/getnetbyht.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/getnetnamadr.c b/cpukit/libnetworking/libc/getnetnamadr.c index f2699bb1fe..4d6597f98c 100644 --- a/cpukit/libnetworking/libc/getnetnamadr.c +++ b/cpukit/libnetworking/libc/getnetnamadr.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/inet_addr.c b/cpukit/libnetworking/libc/inet_addr.c index 078a797012..225ccc1269 100644 --- a/cpukit/libnetworking/libc/inet_addr.c +++ b/cpukit/libnetworking/libc/inet_addr.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/linkaddr.c b/cpukit/libnetworking/libc/linkaddr.c index 49364d14a3..2bad464b12 100644 --- a/cpukit/libnetworking/libc/linkaddr.c +++ b/cpukit/libnetworking/libc/linkaddr.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/map_v4v6.c b/cpukit/libnetworking/libc/map_v4v6.c index e0b0f05d9c..0f8658e117 100644 --- a/cpukit/libnetworking/libc/map_v4v6.c +++ b/cpukit/libnetworking/libc/map_v4v6.c @@ -65,11 +65,6 @@ static char rcsid[] = "$Id$"; #include #include -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/libc/ns_print.c b/cpukit/libnetworking/libc/ns_print.c index 939e3ff9af..f7d7d16c64 100644 --- a/cpukit/libnetworking/libc/ns_print.c +++ b/cpukit/libnetworking/libc/ns_print.c @@ -30,11 +30,6 @@ static char rcsid[] = "$Id$"; #include #include -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/libc/ns_ttl.c b/cpukit/libnetworking/libc/ns_ttl.c index 9d81e2a99f..75093c1dbc 100644 --- a/cpukit/libnetworking/libc/ns_ttl.c +++ b/cpukit/libnetworking/libc/ns_ttl.c @@ -25,11 +25,6 @@ static char rcsid[] = "$Id$"; #include -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/libc/nsap_addr.c b/cpukit/libnetworking/libc/nsap_addr.c index c34d61d81a..a7af57a266 100644 --- a/cpukit/libnetworking/libc/nsap_addr.c +++ b/cpukit/libnetworking/libc/nsap_addr.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/rcmd.c b/cpukit/libnetworking/libc/rcmd.c index d58cecce5d..c588172434 100644 --- a/cpukit/libnetworking/libc/rcmd.c +++ b/cpukit/libnetworking/libc/rcmd.c @@ -44,11 +44,6 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #include #include -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/libc/res_debug.c b/cpukit/libnetworking/libc/res_debug.c index 0b3d9198ac..b747b6e6d2 100644 --- a/cpukit/libnetworking/libc/res_debug.c +++ b/cpukit/libnetworking/libc/res_debug.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/res_mkupdate.c b/cpukit/libnetworking/libc/res_mkupdate.c index 780a8747f5..56362f650b 100644 --- a/cpukit/libnetworking/libc/res_mkupdate.c +++ b/cpukit/libnetworking/libc/res_mkupdate.c @@ -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 #include diff --git a/cpukit/libnetworking/libc/res_query.c b/cpukit/libnetworking/libc/res_query.c index 44b0b58533..784fa433bc 100644 --- a/cpukit/libnetworking/libc/res_query.c +++ b/cpukit/libnetworking/libc/res_query.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/res_send.c b/cpukit/libnetworking/libc/res_send.c index 07687e791f..fadc16c566 100644 --- a/cpukit/libnetworking/libc/res_send.c +++ b/cpukit/libnetworking/libc/res_send.c @@ -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 #include #include diff --git a/cpukit/libnetworking/libc/res_update.c b/cpukit/libnetworking/libc/res_update.c index a780529ce0..ef591e0674 100644 --- a/cpukit/libnetworking/libc/res_update.c +++ b/cpukit/libnetworking/libc/res_update.c @@ -26,11 +26,6 @@ static char rcsid[] = "$Id$"; * */ -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/libnetworking/net/radix.c b/cpukit/libnetworking/net/radix.c index 7b2af1352b..d7419ccca4 100644 --- a/cpukit/libnetworking/net/radix.c +++ b/cpukit/libnetworking/net/radix.c @@ -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"); } diff --git a/cpukit/libnetworking/rtems/mkrootfs.c b/cpukit/libnetworking/rtems/mkrootfs.c index e2eb366cf3..f1b63bd4ee 100644 --- a/cpukit/libnetworking/rtems/mkrootfs.c +++ b/cpukit/libnetworking/rtems/mkrootfs.c @@ -25,11 +25,6 @@ */ -/* Since we compile with strict ANSI we need to undef it to get - * prototypes for extensions - */ -#undef __STRICT_ANSI__ - #include #include #include diff --git a/cpukit/librpc/src/rpc/clnt_perror.c b/cpukit/librpc/src/rpc/clnt_perror.c index 500abb5a18..a7df29c0dd 100644 --- a/cpukit/librpc/src/rpc/clnt_perror.c +++ b/cpukit/librpc/src/rpc/clnt_perror.c @@ -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 #include #include diff --git a/cpukit/librpc/src/rpc/svc.c b/cpukit/librpc/src/rpc/svc.c index 3d5a35316c..751ca3185f 100644 --- a/cpukit/librpc/src/rpc/svc.c +++ b/cpukit/librpc/src/rpc/svc.c @@ -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 #include #include diff --git a/cpukit/score/macros/rtems/score/chain.inl b/cpukit/score/macros/rtems/score/chain.inl index 1694130464..9366636e49 100644 --- a/cpukit/score/macros/rtems/score/chain.inl +++ b/cpukit/score/macros/rtems/score/chain.inl @@ -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 * diff --git a/cpukit/score/src/objectidtoname.c b/cpukit/score/src/objectidtoname.c index 1677dac4b2..90f3e84292 100644 --- a/cpukit/score/src/objectidtoname.c +++ b/cpukit/score/src/objectidtoname.c @@ -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; -- cgit v1.2.3