]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
test_uuidd: don't use error.h
authorKarel Zak <kzak@redhat.com>
Tue, 30 May 2017 08:26:17 +0000 (10:26 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 30 May 2017 08:26:17 +0000 (10:26 +0200)
The header file is not provided by musl-libc.

Reported-by: Assaf Gordon <assafgordon@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
misc-utils/test_uuidd.c

index 66a9f2d3b5caf24cc64e2385e33bc448ad6afe55..73cc90a1723ba56f607d7dd5f84bcfedc279fd3d 100644 (file)
@@ -23,7 +23,6 @@
  *
  *     make uuidd uuidgen localstatedir=/var
  */
-#include <error.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -169,7 +168,8 @@ static void create_nthreads(process_t *proc, size_t index)
 
                rc = pthread_attr_init(&th->thread_attr);
                if (rc) {
-                       error(0, rc, "%d: pthread_attr_init failed", proc->pid);
+                       errno = rc;
+                       warn("%d: pthread_attr_init failed", proc->pid);
                        break;
                }
 
@@ -178,7 +178,8 @@ static void create_nthreads(process_t *proc, size_t index)
                rc = pthread_create(&th->tid, &th->thread_attr, &thread_body, th);
 
                if (rc) {
-                       error(0, rc, "%d: pthread_create failed", proc->pid);
+                       errno = rc;
+                       warn("%d: pthread_create failed", proc->pid);
                        break;
                }
 
@@ -197,8 +198,10 @@ static void create_nthreads(process_t *proc, size_t index)
                thread_t *th = &threads[i];
 
                rc = pthread_join(th->tid, (void *) &th->retval);
-               if (rc)
-                       error(EXIT_FAILURE, rc, "pthread_join failed");
+               if (rc) {
+                       errno = rc;
+                       err(EXIT_FAILURE, "pthread_join failed");
+               }
 
                LOG(2, (stderr, "%d: thread exited [tid=%d,return=%d]\n",
                     proc->pid, (int) th->tid, th->retval));