Author: bonefish Date: 2010-04-15 17:25:10 +0200 (Thu, 15 Apr 2010) New Revision: 36297 Changeset: http://dev.haiku-os.org/changeset/36297/haiku Modified: haiku/trunk/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_detach/2-1.c Log: * Replaced bogus perror() calls with printf()s. * Automatic whitespace cleanup. Modified: haiku/trunk/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_detach/2-1.c =================================================================== --- haiku/trunk/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_detach/2-1.c 2010-04-15 15:15:36 UTC (rev 36296) +++ haiku/trunk/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_detach/2-1.c 2010-04-15 15:25:10 UTC (rev 36297) @@ -1,12 +1,12 @@ -/* +/* * Copyright (c) 2002, Intel Corporation. All rights reserved. * Created by: rolla.n.selbak REMOVE-THIS AT intel DOT com * This file is licensed under the GPL license. For the full content - * of this license, see the COPYING file at the top level of this + * of this license, see the COPYING file at the top level of this * source tree. * Test that pthread_detach() - * + * * If 'thread' has not terminated, pthread_detach() shall not cause it to * terminate. The effect of multiple pthread_detach() calls on the same * @@ -14,25 +14,26 @@ * 1.Create a joinable thread * 2.Detach that thread * 3.Verify that the thread did not terminate because of this - * + * */ +#include <errno.h> #include <pthread.h> #include <stdio.h> -#include <errno.h> +#include <string.h> #include <unistd.h> #include "posixtest.h" void *a_thread_func() { - + pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); /* If the thread wasn't canceled in 10 seconds, time out */ - sleep(10); + sleep(10); - perror("Thread couldn't be canceled (at cleanup time), timing out\n"); + printf("Thread couldn't be canceled (at cleanup time), timing out\n"); pthread_exit(0); return NULL; } @@ -46,21 +47,21 @@ /* Initialize attribute */ if(pthread_attr_init(&new_attr) != 0) { - perror("Cannot initialize attribute object\n"); + printf("Cannot initialize attribute object\n"); return PTS_UNRESOLVED; } - + /* Set the attribute object to be joinable */ if(pthread_attr_setdetachstate(&new_attr, PTHREAD_CREATE_JOINABLE) != 0) { - perror("Error in pthread_attr_setdetachstate()\n"); + printf("Error in pthread_attr_setdetachstate()\n"); return PTS_UNRESOLVED; } - /* Create the thread */ + /* Create the thread */ if(pthread_create(&new_th, &new_attr, a_thread_func, NULL) != 0) - { - perror("Error creating thread\n"); + { + printf("Error creating thread\n"); return PTS_UNRESOLVED; } @@ -71,7 +72,7 @@ return PTS_FAIL; } - /* Verify that it hasn't terminated the thread */ + /* Verify that it hasn't terminated the thread */ ret=pthread_cancel(new_th); if(ret != 0) @@ -81,7 +82,7 @@ printf("Test FAILED\n"); return PTS_FAIL; } - perror("Error canceling thread\n"); + printf("Error canceling thread: %s\n", strerror(ret)); return PTS_UNRESOLVED; }