Remove pthread_mutexattrverifytype.c

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@772 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 2 insertions, 104 deletions

diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile
index 0a7811f1f..090473bba 100644
--- a/nuttx/sched/Makefile
+++ b/nuttx/sched/Makefile
@@ -106,7 +106,7 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 PTHREAD_SRCS	+= pthread_condtimedwait.c pthread_kill.c pthread_sigmask.c
 endif
 ifeq ($(CONFIG_MUTEX_TYPES),y)
-PTHREAD_SRCS	+= pthread_mutexattrsettype.c pthread_mutexattrgettype.c pthread_mutexattrverifytype.c
+PTHREAD_SRCS	+= pthread_mutexattrsettype.c pthread_mutexattrgettype.c
 endif
 SEM_SRCS	= sem_initialize.c sem_init.c sem_destroy.c\
 		  sem_open.c sem_close.c sem_unlink.c \
diff --git a/nuttx/sched/pthread_mutexattrsettype.c b/nuttx/sched/pthread_mutexattrsettype.c
index 150fc7c4f..0df24fda8 100644
--- a/nuttx/sched/pthread_mutexattrsettype.c
+++ b/nuttx/sched/pthread_mutexattrsettype.c
@@ -89,7 +89,7 @@
 
 int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type)
 {
-  if (attr && pthread_mutexattr_verifytype(type) == OK)
+  if (attr && type >= PTHREAD_MUTEX_NORMAL && type <= PTHREAD_MUTEX_RECURSIVE)
     {
       attr->type = type;
       return OK;
diff --git a/nuttx/sched/pthread_mutexattrverifytype.c b/nuttx/sched/pthread_mutexattrverifytype.c
deleted file mode 100644
index a172cb826..000000000
--- a/nuttx/sched/pthread_mutexattrverifytype.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
- * sched/pthread_mutexattrverifytype.c
- *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <pthread.h>
-
-#include "pthread_internal.h"
-
-#ifdef CONFIG_MUTEX_TYPES
-
-/****************************************************************************
- * Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Type Declarations
- ****************************************************************************/
-
-/****************************************************************************
- * Global Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Function: pthread_mutexattr_verifytype
- *
- * Description:
- *   Verify that 'type' is a supported mutex type.
- *
- * Parameters:
- *   type - Mutex type to test
- *
- * Return Value:
- *   0 (OK), if 'type' is a valid mutex type, or
- *  -1 (ERROR) if it is not.
- *
- * Assumptions:
- *
- ****************************************************************************/
-
-int pthread_mutexattr_verifytype(int type)
-{
-  /* The depends on the value assigments in pthread.h */
-
-  if (type >= PTHREAD_MUTEX_NORMAL && type <= PTHREAD_MUTEX_RECURSIVE)
-    {
-      return OK;
-    }
-  else
-    {
-      return ERROR;
-    }
-}
-
-#endif /* CONFIG_MUTEX_TYPES */