From b66a888acd9eb0b28c0e748c4506e267fe47360b Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 12 Apr 2009 17:06:31 +0000 Subject: Print line number in dmnsn_report_error. --- libdimension/error.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'libdimension/error.c') diff --git a/libdimension/error.c b/libdimension/error.c index 6edf577..728652b 100644 --- a/libdimension/error.c +++ b/libdimension/error.c @@ -27,13 +27,14 @@ static dmnsn_severity dmnsn_resilience = DMNSN_SEVERITY_MEDIUM; static pthread_mutex_t dmnsn_resilience_mutex = PTHREAD_MUTEX_INITIALIZER; void -dmnsn_report_error(dmnsn_severity severity, const char *func, const char *str) +dmnsn_report_error(dmnsn_severity severity, const char *func, unsigned int line, + const char *str) { if (severity >= dmnsn_get_resilience()) { - fprintf(stderr, "Dimension ERROR: %s: %s\n", func, str); + fprintf(stderr, "Dimension ERROR: %s, line %u: %s\n", func, line, str); exit(EXIT_FAILURE); } else { - fprintf(stderr, "Dimension WARNING: %s: %s\n", func, str); + fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", func, line, str); } } @@ -42,12 +43,14 @@ dmnsn_get_resilience() { dmnsn_severity resilience; if (pthread_mutex_lock(&dmnsn_resilience_mutex) != 0) { - fprintf(stderr, "Dimension WARNING: %s: %s\n", __PRETTY_FUNCTION__, + fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", + __PRETTY_FUNCTION__, __LINE__, "Couldn't lock resilience mutex."); } resilience = dmnsn_resilience; if (pthread_mutex_unlock(&dmnsn_resilience_mutex) != 0) { - fprintf(stderr, "Dimension WARNING: %s: %s\n", __PRETTY_FUNCTION__, + fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", + __PRETTY_FUNCTION__, __LINE__, "Couldn't unlock resilience mutex."); } return resilience; @@ -57,18 +60,21 @@ void dmnsn_set_resilience(dmnsn_severity resilience) { if (resilience > DMNSN_SEVERITY_HIGH) { - fprintf(stderr, "Dimension ERROR: %s: %s\n", __PRETTY_FUNCTION__, + fprintf(stderr, "Dimension ERROR: %s, line %u: %s\n", + __PRETTY_FUNCTION__, __LINE__, "Resilience has wrong value."); exit(EXIT_FAILURE); } if (pthread_mutex_lock(&dmnsn_resilience_mutex) != 0) { - fprintf(stderr, "Dimension WARNING: %s: %s\n", __PRETTY_FUNCTION__, + fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", + __PRETTY_FUNCTION__, __LINE__, "Couldn't lock resilience mutex."); } dmnsn_resilience = resilience; if (pthread_mutex_unlock(&dmnsn_resilience_mutex) != 0) { - fprintf(stderr, "Dimension WARNING: %s: %s\n", __PRETTY_FUNCTION__, + fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", + __PRETTY_FUNCTION__, __LINE__, "Couldn't unlock resilience mutex."); } } -- cgit v1.2.3