Removed "thread"-s from error.c

Author: xaionaro

error.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <syslog.h>
-#include <pthread.h> /* pthread_self() */
 #include "error.h"
 #include "common.h"
 #include "configuration.h"
@@ -42,8 +41,6 @@ static int *debug	 = &zero;
 static int *quiet	 = &zero;
 static int *verbose	 = &three;
 
-pthread_mutex_t error_mutex = PTHREAD_MUTEX_INITIALIZER;
-
 static int printf_stderr(const char *fmt, ...) {
 	va_list args;
 	int rc;
@@ -170,15 +167,12 @@ void _critical(const char *const function_name, const char *fmt, ...) {
 	if (*quiet)
 		return;
 
-	pthread_mutex_lock(&error_mutex);
-
 	outputmethod_t method = *outputmethod;
 
 	{
 		va_list args;
-		pthread_t thread = pthread_self();
 
-		outfunct[method]("Critical (thread %p): %s(): ", thread, function_name);
+		outfunct[method]("Critical: %s(): ", function_name);
 		va_start(args, fmt);
 		voutfunct[method](fmt, args);
 		va_end(args);
@@ -197,7 +191,6 @@ void _critical(const char *const function_name, const char *fmt, ...) {
 			outfunct[method]("_critical(): Got error, but cannot print the backtrace. Current errno: %u: %s\n",
 				errno, strerror(errno));
 			flushfunct[method](LOG_CRIT);
-			pthread_mutex_unlock(&error_mutex);
 			exit(EXIT_FAILURE);
 		}
 
@@ -208,7 +201,6 @@ void _critical(const char *const function_name, const char *fmt, ...) {
 	}
 #endif
 
-	pthread_mutex_unlock(&error_mutex);
 	exit(errno);
 
 	return;
@@ -223,20 +215,16 @@ void _error(const char *const function_name, const char *fmt, ...) {
 	if (*verbose < 1)
 		return;
 
-	pthread_mutex_lock(&error_mutex);
-
-	pthread_t thread = pthread_self();
 	outputmethod_t method = *outputmethod;
 
-	outfunct[method](*debug ? "Error (thread %p): %s(): " : "Error: ", thread, function_name);
+	outfunct[method](*debug ? "Error: %s(): " : "Error: ", function_name);
 	va_start(args, fmt);
 	voutfunct[method](fmt, args);
 	va_end(args);
 	if (errno)
 		outfunct[method](" (%i: %s)", errno, strerror(errno));
 	flushfunct[method](LOG_ERR);
 
-	pthread_mutex_unlock(&error_mutex);
 	return;
 }
 
@@ -249,18 +237,14 @@ void _info_short(const char *const function_name, const char *fmt, ...) {
 	if (*verbose < 3)
 		return;
 
-	pthread_mutex_lock(&error_mutex);
-
-	pthread_t thread = pthread_self();
 	outputmethod_t method = *outputmethod;
 
-	outfunct[method](*debug ? "Info (thread %p): %s(): " : "", thread, function_name);
+	outfunct[method](*debug ? "Info: %s(): " : "", function_name);
 	va_start(args, fmt);
 	voutfunct[method](fmt, args);
 	va_end(args);
 	flushfunct[method](LOG_INFO);
 
-	pthread_mutex_unlock(&error_mutex);
 	return;
 }
 
@@ -273,18 +257,14 @@ void _info(const char *const function_name, const char *fmt, ...) {
 	if (*verbose < 3)
 		return;
 
-	pthread_mutex_lock(&error_mutex);
-
-	pthread_t thread = pthread_self();
 	outputmethod_t method = *outputmethod;
 
-	outfunct[method](*debug ? "Info (thread %p): %s(): " : "Info: ", thread, function_name);
+	outfunct[method](*debug ? "Info: %s(): " : "Info: ", function_name);
 	va_start(args, fmt);
 	voutfunct[method](fmt, args);
 	va_end(args);
 	flushfunct[method](LOG_INFO);
 
-	pthread_mutex_unlock(&error_mutex);
 	return;
 }
 
@@ -297,18 +277,14 @@ void _warning(const char *const function_name, const char *fmt, ...) {
 	if (*verbose < 2)
 		return;
 
-	pthread_mutex_lock(&error_mutex);
-
-	pthread_t thread = pthread_self();
 	outputmethod_t method = *outputmethod;
 
-	outfunct[method](*debug ? "Warning (thread %p): %s(): " : "Warning: ", thread, function_name);
+	outfunct[method](*debug ? "Warning: %s(): " : "Warning: ", function_name);
 	va_start(args, fmt);
 	voutfunct[method](fmt, args);
 	va_end(args);
 	flushfunct[method](LOG_WARNING);
 
-	pthread_mutex_unlock(&error_mutex);
 	return;
 }
 
@@ -321,18 +297,14 @@ void _debug(int debug_level, const char *const function_name, const char *fmt, .
 	if (debug_level > *debug)
 		return;
 
-	pthread_mutex_lock(&error_mutex);
-
-	pthread_t thread = pthread_self();
 	outputmethod_t method = *outputmethod;
 
-	outfunct[method]("Debug%u (thread %p): %s(): ", debug_level, thread, function_name);
+	outfunct[method]("Debug%u: %s(): ", debug_level, function_name);
 	va_start(args, fmt);
 	voutfunct[method](fmt, args);
 	va_end(args);
 	flushfunct[method](LOG_DEBUG);
 
-	pthread_mutex_unlock(&error_mutex);
 	return;
 }
 
@@ -341,9 +313,6 @@ void error_init(void *_outputmethod, int *_quiet, int *_verbose, int *_debug) {
 	quiet		= _quiet;
 	verbose		= _verbose;
 	debug		= _debug;
-
-	pthread_mutex_init(&error_mutex, NULL);
-
 	return;
 }