Index: uspace/app/trace/Makefile
===================================================================
--- uspace/app/trace/Makefile	(revision c1694b6b243b360b5f1fbf0629b5e7d4f7f4a515)
+++ uspace/app/trace/Makefile	(revision f43742e2319f2b70763dd51bbc6ef09fd8a86f2e)
@@ -36,6 +36,5 @@
 	ipcp.c \
 	ipc_desc.c \
-	proto.c \
-	errors.c
+	proto.c
 
 include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/trace/errors.c
===================================================================
--- uspace/app/trace/errors.c	(revision c1694b6b243b360b5f1fbf0629b5e7d4f7f4a515)
+++ 	(revision )
@@ -1,61 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - 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.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-/** @addtogroup trace
- * @{
- */
-/** @file
- */
-
-#include <errno.h>
-#include "errors.h"
-
-const err_desc_t err_desc[] = {
-	[-EOK]		= { "EOK",		"No error" },
-	[-ENOENT]	= { "ENOENT",		"No such entry" },
-	[-ENOMEM]	= { "ENOMEM",		"Not enough memory" },
-	[-ELIMIT]	= { "ELIMIT",		"Limit exceeded" },
-	[-EREFUSED]	= { "EREFUSED",		"Connection refused" },
-
-	[-EFORWARD]	= { "EFORWARD",		"Forward error" },
-	[-EPERM]	= { "EPERM",		"Permission denied" },
-	[-EHANGUP]	= { "EHANGUP",		"Answerbox closed connection" },
-	[-EEXIST]	= { "EEXIST",		"Entry already exists" },
-	[-EBADMEM]	= { "EBADMEM",		"Bad memory pointer" },
-
-	[-ENOTSUP]	= { "ENOTSUP",		"Not supported" },
-	[-EADDRNOTAVAIL] = { "EADDRNOTAVAIL", 	"Address not available." },
-	[-ETIMEOUT]	= { "ETIMEOUT",		"Timeout expired" },
-	[-EINVAL]	= { "EINVAL",		"Invalid value" },
-	[-EBUSY]	= { "EBUSY",		"Resource is busy" },
-
-	[-EOVERFLOW]	= { "EOVERFLOW",	"The result does not fit its size." }
-};
-
-/** @}
- */
Index: uspace/app/trace/errors.h
===================================================================
--- uspace/app/trace/errors.h	(revision c1694b6b243b360b5f1fbf0629b5e7d4f7f4a515)
+++ 	(revision )
@@ -1,48 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - 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.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-/** @addtogroup trace
- * @{
- */
-/** @file
- */
-
-#ifndef ERRORS_H_
-#define ERRORS_H_
-
-typedef struct {
-	const char *name;  /**< Error value name (Exx) */
-	const char *desc;  /**< Error description */
-} err_desc_t;
-
-extern const err_desc_t err_desc[];
-
-#endif
-
-/** @}
- */
Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision c1694b6b243b360b5f1fbf0629b5e7d4f7f4a515)
+++ uspace/app/trace/trace.c	(revision f43742e2319f2b70763dd51bbc6ef09fd8a86f2e)
@@ -63,5 +63,4 @@
 #include "syscalls.h"
 #include "ipcp.h"
-#include "errors.h"
 #include "trace.h"
 
@@ -226,6 +225,6 @@
 		if (sval >= -15 && sval <= 0) {
 			printf("%ld %s (%s)", sval,
-			    err_desc[-sval].name,
-			    err_desc[-sval].desc);
+			    str_error_name((int) sval),
+			    str_error((int) sval));
 		} else {
 			printf("%ld", sval);
@@ -235,6 +234,6 @@
 		if (sval >= -15 && sval < 0) {
 			printf("%ld %s (%s)", sval,
-			    err_desc[-sval].name,
-			    err_desc[-sval].desc);
+			    str_error_name((int) sval),
+			    str_error((int) sval));
 		} else {
 			printf("%ld", sval);