 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread.h,v 1.33 2009/01/11 02:46:48 christos Exp $	*/
+/*	$NetBSD: pthread.h,v 1.34 2010/08/06 05:25:02 christos Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams.
+ *
  * 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.
 @@ -181,26 +181,27 @@ int	pthread_barrier_destroy(pthread_barr
 int	pthread_barrierattr_init(pthread_barrierattr_t *);
 int	pthread_barrierattr_destroy(pthread_barrierattr_t *);
 int	pthread_getschedparam(pthread_t, int * __restrict,
 	    struct sched_param * __restrict);
 int	pthread_setschedparam(pthread_t, int, const struct sched_param *);
 int	pthread_setschedprio(pthread_t, int);
 int 	*pthread__errno(void);
 #if defined(_NETBSD_SOURCE)
 int	pthread_getaffinity_np(pthread_t, size_t, cpuset_t *);
 int	pthread_setaffinity_np(pthread_t, size_t, cpuset_t *);
 int	pthread_getattr_np(pthread_t, pthread_attr_t *);
 int	pthread_mutex_held_np(pthread_mutex_t *);
 pthread_t pthread_mutex_owner_np(pthread_mutex_t *);
 int	pthread_rwlock_held_np(pthread_rwlock_t *);
 int	pthread_rwlock_wrheld_np(pthread_rwlock_t *);
 int	pthread_rwlock_rdheld_np(pthread_rwlock_t *);
 int	pthread_cond_has_waiters_np(pthread_cond_t *);
 #endif	/* _NETBSD_SOURCE */
 __END_DECLS

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_attr.c,v 1.12 2009/01/18 12:14:16 lukem Exp $	*/
+/*	$NetBSD: pthread_attr.c,v 1.13 2010/08/06 05:25:02 christos Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_attr.c,v 1.12 2009/01/18 12:14:16 lukem Exp $");
+__RCSID("$NetBSD: pthread_attr.c,v 1.13 2010/08/06 05:25:02 christos Exp $");
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "pthread.h"
 #include "pthread_int.h"
 static struct pthread_attr_private *pthread__attr_init_private(
     pthread_attr_t *);
 @@ -433,13 +433,26 @@ pthread_attr_setname_np(pthread_attr_t *
 		return EINVAL;
+	}
 	p->ptap_namearg = arg;
 	return 0;
+}
 int
 pthread_attr_setcreatesuspend_np(pthread_attr_t *attr)
+{
 	attr->pta_flags |= PT_FLAG_SUSPENDED;
 	return 0;
+}
 int
 pthread_getattr_np(pthread_t thread, pthread_attr_t *attr)
+{
 	int error;
 	if ((error = pthread_attr_init(attr)) != 0)
 		return error;
 	if ((error = pthread_attr_get_np(thread, attr)) != 0) {
 		(void)pthread_attr_destroy(attr);
 		return error;
+	}
 	return 0;
+}