From 32ba727717d227c8be72f757f6e481a3e0f9f764 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Jan 2001 13:46:28 +0000 Subject: 2001-01-22 Michael Hamel * include/rtems/posix/semaphore.h, inline/rtems/posix/semaphore.inl, src/ptimer1.c, include/rtems/posix/semaphore.h, inline/rtems/posix/semaphore.inl, src/alarm.c, src/ptimer1.c, src/semaphorenametoid.c, src/semopen.c, src/semunlink.c: Modifications to make CodeWarrior happy. --- cpukit/posix/ChangeLog | 8 ++++++++ cpukit/posix/include/rtems/posix/semaphore.h | 4 ++-- cpukit/posix/inline/rtems/posix/semaphore.inl | 2 +- cpukit/posix/src/alarm.c | 2 +- cpukit/posix/src/ptimer1.c | 6 +++--- cpukit/posix/src/semaphorenametoid.c | 4 ++-- cpukit/posix/src/semopen.c | 2 +- cpukit/posix/src/semunlink.c | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) (limited to 'cpukit') diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog index c8a18e7ec2..6bc1bcba49 100644 --- a/cpukit/posix/ChangeLog +++ b/cpukit/posix/ChangeLog @@ -1,3 +1,11 @@ +2001-01-22 Michael Hamel + + * include/rtems/posix/semaphore.h, inline/rtems/posix/semaphore.inl, + src/ptimer1.c, include/rtems/posix/semaphore.h, + inline/rtems/posix/semaphore.inl, src/alarm.c, src/ptimer1.c, + src/semaphorenametoid.c, src/semopen.c, src/semunlink.c: + Modifications to make CodeWarrior happy. + 2001-01-12 Joel Sherrill * src/README.mqueue: Enhanced example. diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/posix/include/rtems/posix/semaphore.h index 95a4f9c15a..0bbca530af 100644 --- a/cpukit/posix/include/rtems/posix/semaphore.h +++ b/cpukit/posix/include/rtems/posix/semaphore.h @@ -96,7 +96,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Free ( */ RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get ( - Objects_Id *id, + sem_t *id, Objects_Locations *location ); @@ -164,7 +164,7 @@ int _POSIX_Semaphore_Wait_support( int _POSIX_Semaphore_Name_to_id( const char *name, - Objects_Id *id + sem_t *id ); #include diff --git a/cpukit/posix/inline/rtems/posix/semaphore.inl b/cpukit/posix/inline/rtems/posix/semaphore.inl index 2d9ad70602..fb20c8ad64 100644 --- a/cpukit/posix/inline/rtems/posix/semaphore.inl +++ b/cpukit/posix/inline/rtems/posix/semaphore.inl @@ -60,7 +60,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Namespace_remove ( */ RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get ( - Objects_Id *id, + sem_t *id, Objects_Locations *location ) { diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c index 10be929d25..b2258d7e56 100644 --- a/cpukit/posix/src/alarm.c +++ b/cpukit/posix/src/alarm.c @@ -13,7 +13,7 @@ #include -#include +//#include #include #include diff --git a/cpukit/posix/src/ptimer1.c b/cpukit/posix/src/ptimer1.c index d74865e960..eee24d966c 100644 --- a/cpukit/posix/src/ptimer1.c +++ b/cpukit/posix/src/ptimer1.c @@ -543,7 +543,7 @@ int timer_settime( /* XXX error handling */ break; - default: + default: break; } @@ -624,12 +624,12 @@ int timer_settime( set_errno_and_return_minus_one( EINVAL ); break; - default: + default: break; } break; - default: + default: break; /* It does nothing, although it will be probably necessary to * return an error */ diff --git a/cpukit/posix/src/semaphorenametoid.c b/cpukit/posix/src/semaphorenametoid.c index 9f14a1e79f..b485fea1e5 100644 --- a/cpukit/posix/src/semaphorenametoid.c +++ b/cpukit/posix/src/semaphorenametoid.c @@ -26,7 +26,7 @@ int _POSIX_Semaphore_Name_to_id( const char *name, - Objects_Id *id + sem_t *id ) { Objects_Name_to_id_errors status; @@ -38,7 +38,7 @@ int _POSIX_Semaphore_Name_to_id( return EINVAL; status = _Objects_Name_to_id( - &_POSIX_Semaphore_Information, (char *)name, 0, id ); + &_POSIX_Semaphore_Information, (char *)name, 0, (Objects_Id*)id ); if ( status == OBJECTS_SUCCESSFUL ) return 0; diff --git a/cpukit/posix/src/semopen.c b/cpukit/posix/src/semopen.c index f395d8f93d..0d8797696a 100644 --- a/cpukit/posix/src/semopen.c +++ b/cpukit/posix/src/semopen.c @@ -41,7 +41,7 @@ sem_t *sem_open( mode_t mode; unsigned int value = 0; int status; - Objects_Id the_semaphore_id; + sem_t the_semaphore_id; POSIX_Semaphore_Control *the_semaphore; Objects_Locations location; diff --git a/cpukit/posix/src/semunlink.c b/cpukit/posix/src/semunlink.c index 55462fb329..78a5781dd4 100644 --- a/cpukit/posix/src/semunlink.c +++ b/cpukit/posix/src/semunlink.c @@ -32,7 +32,7 @@ int sem_unlink( { int status; register POSIX_Semaphore_Control *the_semaphore; - Objects_Id the_semaphore_id; + sem_t the_semaphore_id; _Thread_Disable_dispatch(); -- cgit v1.2.3