From: Joshua Colp <jcolp@digium.com>
Date: Sun, 22 Jul 2018 15:41:03 +0000 (+0000)
Subject: sched: Make ABI compatible between dev mode and non-dev mode.
X-Git-Tag: 13.23.0-rc1~62^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbe1b1eff164616344f2a7a2412fc59773e149f;p=thirdparty%2Fasterisk.git

sched: Make ABI compatible between dev mode and non-dev mode.

In the past there was an assertion in the ast_sched_del function
and in order to ensure it was useful the calling function name,
line number, and filename had to be passed in. This cause the ABI
to be different between dev mode and non-dev mode.

This assertion is no longer present so the special logic can be
removed to make it the same between them both.

Change-Id: Icbc69c801e357d7004efc5cf2ab936d9b83b6ab8
---

diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h
index fb630813e6..804b05c0c9 100644
--- a/include/asterisk/sched.h
+++ b/include/asterisk/sched.h
@@ -284,12 +284,7 @@ const void *ast_sched_find_data(struct ast_sched_context *con, int id);
  *
  * \return Returns 0 on success, -1 on failure
  */
-#ifndef AST_DEVMODE
 int ast_sched_del(struct ast_sched_context *con, int id) attribute_warn_unused_result;
-#else
-int _ast_sched_del(struct ast_sched_context *con, int id, const char *file, int line, const char *function) attribute_warn_unused_result;
-#define	ast_sched_del(a, b)	_ast_sched_del(a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
-#endif
 
 /*!
  * \brief Determines number of seconds until the next outstanding event to take place
diff --git a/main/sched.c b/main/sched.c
index 9729ccbc8d..0e7521e18d 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -610,11 +610,7 @@ const void *ast_sched_find_data(struct ast_sched_context *con, int id)
  * would be two or more in the list with that
  * id.
  */
-#ifndef AST_DEVMODE
 int ast_sched_del(struct ast_sched_context *con, int id)
-#else
-int _ast_sched_del(struct ast_sched_context *con, int id, const char *file, int line, const char *function)
-#endif
 {
 	struct sched *s = NULL;
 	int *last_id = ast_threadstorage_get(&last_del_id, sizeof(int));