From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 25 Mar 2014 15:47:17 +0000 (+0000)
Subject: Revert -r411073.  It didn't help and blew up the system.
X-Git-Tag: 13.0.0-beta1~409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ebf3e3c76ed599b46fe97336b0fd7be416852f;p=thirdparty%2Fasterisk.git

Revert -r411073.  It didn't help and blew up the system.

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

diff --git a/main/lock.c b/main/lock.c
index 0af736f7db..d66e01b273 100644
--- a/main/lock.c
+++ b/main/lock.c
@@ -311,7 +311,6 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
 	}
 #endif /* DEBUG_THREADS */
 
-	ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
 	return res;
 }
 
@@ -418,7 +417,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
 			__ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized and unable to initialize.\n",
 					 filename, lineno, func, mutex_name);
 		}
-		ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
 		return res;
 	}
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
@@ -479,7 +477,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
 	}
 #endif /* DEBUG_THREADS */
 
-	ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
 	return res;
 }
 
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 96898e18f5..b4245c8b45 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -37,12 +37,6 @@ void ast_register_file_version(const char *file, const char *version) { }
 void ast_unregister_file_version(const char *file) { }
 #endif
 
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function);
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function)
-{
-	/*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */
-}
-
 struct ast_flags ast_compat = { 7 };
 
 /*** MODULEINFO
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index fe3c9f30f0..ef5225352d 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -80,12 +80,6 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 int option_debug = 0;
 int option_verbose = 0;
 
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function);
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function)
-{
-	/*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */
-}
-
 void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)
 {