From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 24 Jul 2007 22:13:37 +0000 (+0000)
Subject: Merged revisions 76937 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1928
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aa9e4fc4d1d3b7fddd6f28e01b6abdd30605110;p=thirdparty%2Fasterisk.git

Merged revisions 76937 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r76937 | tilghman | 2007-07-24 17:12:43 -0500 (Tue, 24 Jul 2007) | 10 lines

Merged revisions 76934 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r76934 | tilghman | 2007-07-24 17:11:33 -0500 (Tue, 24 Jul 2007) | 2 lines

Oops, res contains the error code, not errno.  I was wondering why a mutex was reporting "No such file or directory"...

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 22a23a8444..4376665f73 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -273,7 +273,7 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con
 		}
 	} else {
 		__ast_mutex_logger("%s line %d (%s): Error obtaining mutex: %s\n",
-				   filename, lineno, func, strerror(errno));
+				   filename, lineno, func, strerror(res));
 		DO_THREAD_CRASH;
 	}