posix: Use _Objects_Get_local() for semaphores

This simplifies the code since the object location is no longer used.
Remove superfluous header includes.

1 files changed, 19 insertions, 32 deletions

diff --git a/cpukit/posix/src/semdestroy.c b/cpukit/posix/src/semdestroy.c
index 751169941b..5264472156 100644
--- a/cpukit/posix/src/semdestroy.c
+++ b/cpukit/posix/src/semdestroy.c
@@ -26,44 +26,31 @@ int sem_destroy(
   sem_t *sem
 )
 {
-  POSIX_Semaphore_Control          *the_semaphore;
-  Objects_Locations                 location;
-  ISR_lock_Context                  lock_context;
+  POSIX_Semaphore_Control *the_semaphore;
+  ISR_lock_Context         lock_context;
 
   _Objects_Allocator_lock();
-  the_semaphore = _POSIX_Semaphore_Get_interrupt_disable(
-    sem,
-    &location,
-    &lock_context
-  );
-  switch ( location ) {
+  the_semaphore = _POSIX_Semaphore_Get( sem, &lock_context );
 
-    case OBJECTS_LOCAL:
-      _CORE_semaphore_Acquire_critical(
-        &the_semaphore->Semaphore,
-        &lock_context
-      );
+  if ( the_semaphore == NULL ) {
+    _Objects_Allocator_unlock();
+    rtems_set_errno_and_return_minus_one( EINVAL );
+  }
 
-      /*
-       *  Undefined operation on a named semaphore. Release the object
-       *  and fall to the EINVAL return at the bottom.
-       */
-      if ( the_semaphore->named ) {
-        _CORE_semaphore_Release( &the_semaphore->Semaphore, &lock_context );
-      } else {
-        _POSIX_Semaphore_Delete( the_semaphore, &lock_context );
-        _Objects_Allocator_unlock();
-        return 0;
-      }
+  _CORE_semaphore_Acquire_critical(
+    &the_semaphore->Semaphore,
+    &lock_context
+  );
 
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:
-#endif
-    case OBJECTS_ERROR:
-      break;
+  if ( the_semaphore->named ) {
+    /* Undefined operation on a named semaphore */
+    _CORE_semaphore_Release( &the_semaphore->Semaphore, &lock_context );
+    _Objects_Allocator_unlock();
+    rtems_set_errno_and_return_minus_one( EINVAL );
   }
 
-  _Objects_Allocator_unlock();
+  _POSIX_Semaphore_Delete( the_semaphore, &lock_context );
 
-  rtems_set_errno_and_return_minus_one( EINVAL );
+  _Objects_Allocator_unlock();
+  return 0;
 }